summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano2015-06-111-0/+10
|\
| * diff.c: --ws-error-highlight=<kind> optionJunio C Hamano2015-05-261-0/+10
* | Sync with 2.4.3Junio C Hamano2015-06-052-1/+78
|\ \
| * | Git 2.4.3v2.4.3Junio C Hamano2015-06-052-1/+78
| * | Merge branch 'ps/doc-packfile-vs-pack-file' into maintJunio C Hamano2015-06-053-9/+9
| |\ \
| * \ \ Merge branch 'fg/document-commit-message-stripping' into maintJunio C Hamano2015-06-051-4/+7
| |\ \ \
| * \ \ \ Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano2015-06-051-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'ja/tutorial-asciidoctor-fix' into maintJunio C Hamano2015-06-051-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/stripspace-asciidoctor-fix' into maintJunio C Hamano2015-06-051-3/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano2015-06-0519-102/+107
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-051-2/+33
| |\ \ \ \ \ \ \ \
* | | | | | | | | | The first half of the seventh batch for 2.5Junio C Hamano2015-06-051-0/+14
* | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2015-06-051-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | each_ref_fn: change to take an object_id parameterMichael Haggerty2015-05-251-1/+1
* | | | | | | | | | | Merge branch 'jk/at-push-sha1'Junio C Hamano2015-06-053-4/+31
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | for-each-ref: accept "%(push)" formatjk/at-push-sha1Jeff King2015-05-221-0/+6
| * | | | | | | | | | | sha1_name: implement @{push} shorthandJeff King2015-05-221-0/+25
| * | | | | | | | | | | remote.c: drop "remote" pointer from "struct branch"Jeff King2015-05-211-4/+0
* | | | | | | | | | | | Sixth batch for 2.5 cycleJunio C Hamano2015-06-011-1/+50
* | | | | | | | | | | | Merge branch 'fm/fetch-raw-sha1'Junio C Hamano2015-06-013-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | upload-pack: optionally allow fetching reachable sha1fm/fetch-raw-sha1Fredrik Medley2015-05-223-1/+15
| * | | | | | | | | | | | config.txt: clarify allowTipSHA1InWant with camelCaseFredrik Medley2015-05-211-2/+2
* | | | | | | | | | | | | Merge branch 'sg/help-group'Junio C Hamano2015-06-012-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | command-list.txt: add the common groups blockSébastien Guimmara2015-05-211-1/+3
| * | | | | | | | | | | | | command-list: prepare machinery for upcoming "common groups" sectionEric Sunshine2015-05-211-0/+4
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'mm/log-format-raw-doc'Junio C Hamano2015-06-012-2/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Documentation/log: clarify sha1 non-abbreviation in log --rawmm/log-format-raw-docMatthieu Moy2015-05-201-1/+4
| * | | | | | | | | | | | | Documentation/log: clarify what --raw meansMatthieu Moy2015-05-181-1/+10
* | | | | | | | | | | | | | Merge branch 'dt/cat-file-follow-symlinks'Junio C Hamano2015-06-011-1/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | cat-file: add --follow-symlinks to --batchdt/cat-file-follow-symlinksDavid Turner2015-05-201-1/+98
* | | | | | | | | | | | | | | Merge branch 'mc/commit-doc-grammofix'Junio C Hamano2015-06-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Documentation/git-commit: grammofixmc/commit-doc-grammofixMichael Coleman2015-05-191-1/+1
* | | | | | | | | | | | | | | | Merge branch 'jk/http-backend-deadlock'Junio C Hamano2015-06-011-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlockjk/http-backend-deadlockJunio C Hamano2015-05-251-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3jk/http-backend-deadlock-2.3Junio C Hamano2015-05-251-0/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | http-backend: spool ref negotiation requests to bufferjk/http-backend-deadlock-2.2Jeff King2015-05-251-0/+9
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Sync with 2.4.2Junio C Hamano2015-05-262-1/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Git 2.4.2v2.4.2Junio C Hamano2015-05-262-1/+47
| * | | | | | | | | | | | | | | | Merge branch 'jc/hash-object' into maintJunio C Hamano2015-05-261-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | Fifth batch for 2.5 cycleJunio C Hamano2015-05-261-6/+28
* | | | | | | | | | | | | | | | | | Merge branch 'nd/untracked-cache'Junio C Hamano2015-05-263-1/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | git-status.txt: advertisement for untracked cacheNguyễn Thái Ngọc Duy2015-03-121-1/+4
| * | | | | | | | | | | | | | | | | | untracked cache: guard and disable on system changesNguyễn Thái Ngọc Duy2015-03-121-0/+4
| * | | | | | | | | | | | | | | | | | update-index: test the system before enabling untracked cacheNguyễn Thái Ngọc Duy2015-03-121-0/+6
| * | | | | | | | | | | | | | | | | | update-index: manually enable or disable untracked cacheNguyễn Thái Ngọc Duy2015-03-121-0/+8
| * | | | | | | | | | | | | | | | | | untracked cache: save to an index extensionNguyễn Thái Ngọc Duy2015-03-121-0/+58
* | | | | | | | | | | | | | | | | | | Merge branch 'pt/pull-ff-vs-merge-ff'Junio C Hamano2015-05-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | pull: make pull.ff=true override merge.ffPaul Tan2015-05-181-1/+1
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Fourth batch for 2.5 cycleJunio C Hamano2015-05-221-0/+75
* | | | | | | | | | | | | | | | | Merge branch 'ps/doc-packfile-vs-pack-file'Junio C Hamano2015-05-223-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |