summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jg/cguide-we-cannot-count'Junio C Hamano2015-04-141-1/+1
|\
| * CodingGuidelines: update 'rough' rule countjg/cguide-we-cannot-countJulian Gindi2015-04-141-1/+1
* | Git 2.4.0-rc1v2.4.0-rc1Junio C Hamano2015-04-021-2/+3
* | Sync with 2.3.5Junio C Hamano2015-03-313-2/+8
|\ \
| * | Git 2.3.5v2.3.5Junio C Hamano2015-03-312-1/+5
| * | Merge branch 'ss/pull-rebase-preserve' into maintJunio C Hamano2015-03-312-4/+5
| |\ \
| | * | docs: clarify what git-rebase's "-p" / "--preserve-merges" doesss/pull-rebase-preserveSebastian Schuberth2015-03-301-1/+3
| * | | Merge branch 'ph/push-doc-cas' into maintJunio C Hamano2015-03-311-8/+6
| |\ \ \
* | \ \ \ Sync with maintJunio C Hamano2015-03-282-1/+42
|\ \ \ \ \ | |/ / / /
| * | | | Prepare for 2.3.5Junio C Hamano2015-03-281-0/+41
| * | | | Merge branch 'nd/doc-git-index-version' into maintJunio C Hamano2015-03-281-1/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/submitting-patches-mention-send-email' into maintJunio C Hamano2015-03-281-0/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/prune-with-corrupt-refs' into maintJunio C Hamano2015-03-281-0/+11
| |\ \ \ \ \ \
| * | | | | | | 2.3.2 release notes: typofixThomas Ackermann2015-03-281-1/+1
* | | | | | | | RelNotes: minor doc updatesJunio C Hamano2015-03-281-1/+3
* | | | | | | | Merge branch 'ph/push-doc-cas'Junio C Hamano2015-03-281-8/+6
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | git-push.txt: clean up force-with-lease wordingph/push-doc-casPhil Hord2015-03-261-8/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'ss/pull-rebase-preserve'Junio C Hamano2015-03-281-3/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | docs: clarify "preserve" option wording for git-pullSebastian Schuberth2015-03-261-3/+2
| |/ / / / /
* | | | | | Merge branch 'jn/doc-api-errors'Junio C Hamano2015-03-281-1/+1
|\ \ \ \ \ \
| * | | | | | api-error-handling doc: typofixjn/doc-api-errorsThomas Ackermann2015-03-281-1/+1
* | | | | | | Git 2.4.0-rc0v2.4.0-rc0Junio C Hamano2015-03-261-0/+7
* | | | | | | Getting ready for -rc0Junio C Hamano2015-03-251-0/+52
* | | | | | | Merge branch 'nd/doc-git-index-version'Junio C Hamano2015-03-251-1/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | git.txt: list index versions in plain Englishnd/doc-git-index-versionNguyễn Thái Ngọc Duy2015-03-241-1/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jk/prune-with-corrupt-refs'Junio C Hamano2015-03-251-0/+11
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | refs: introduce a "ref paranoia" flagJeff King2015-03-201-0/+11
* | | | | | Merge branch 'jc/submitting-patches-mention-send-email'Junio C Hamano2015-03-251-0/+5
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | SubmittingPatches: encourage users to use format-patch and send-emailjc/submitting-patches-mention-send-emailJunio C Hamano2015-03-151-0/+5
| | |/ / / | |/| | |
* | | | | Merge branch 'dj/log-graph-with-no-walk'Junio C Hamano2015-03-251-0/+2
|\ \ \ \ \
| * | | | | revision: forbid combining --graph and --no-walkdj/log-graph-with-no-walkDongcan Jiang2015-03-191-0/+2
* | | | | | Merge branch 'kd/rev-list-bisect-first-parent'Junio C Hamano2015-03-251-3/+4
|\ \ \ \ \ \
| * | | | | | rev-list: refuse --first-parent combined with --bisectkd/rev-list-bisect-first-parentKevin Daudt2015-03-191-3/+4
| | |/ / / / | |/| | | |
* | | | | | Sync with v2.3.4Junio C Hamano2015-03-232-1/+34
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Git 2.3.4v2.3.4Junio C Hamano2015-03-232-1/+34
| * | | | | Merge branch 'mg/doc-status-color-slot' into maintJunio C Hamano2015-03-231-2/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/decorate-leaky-separator-color' into maintJunio C Hamano2015-03-231-49/+75
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'km/imap-send-libcurl-options' into maintJunio C Hamano2015-03-231-1/+2
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Post 2.3 cycle (batch #12)Junio C Hamano2015-03-231-15/+46
* | | | | | | | Merge branch 'jk/push-config'Junio C Hamano2015-03-232-1/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | push: allow --follow-tags to be set by config push.followTagsjk/push-configDave Olszewski2015-03-142-1/+10
* | | | | | | | | Merge branch 'nd/config-doc-camelCase'Junio C Hamano2015-03-2337-212/+212
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | *config.txt: stick to camelCase naming conventionnd/config-doc-camelCaseNguyễn Thái Ngọc Duy2015-03-1337-212/+212
* | | | | | | | | | Post 2.3 cycle (batch #11)Junio C Hamano2015-03-201-0/+64
* | | | | | | | | | Merge branch 'jc/decorate-leaky-separator-color'Junio C Hamano2015-03-201-49/+73
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | log --decorate: do not leak "commit" color into the next itemjc/decorate-leaky-separator-colorJunio C Hamano2015-03-041-0/+7
| * | | | | | | | | Documentation/config.txt: simplify boolean description in the syntax sectionJunio C Hamano2015-03-041-2/+2
| * | | | | | | | | Documentation/config.txt: describe 'color' value type in the "Values" sectionJunio C Hamano2015-03-041-16/+13
| * | | | | | | | | Documentation/config.txt: have a separate "Values" sectionJunio C Hamano2015-03-041-8/+31
| * | | | | | | | | Documentation/config.txt: describe the structure first and then meaningJunio C Hamano2015-03-041-16/+15