summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* worktree: stop supporting moving worktrees manuallynd/do-not-move-worktree-manuallyNguyễn Thái Ngọc Duy2016-01-221-5/+10
* Merge branch 'mr/worktree-list'Junio C Hamano2015-10-261-1/+48
|\
| * worktree: add 'list' commandmr/worktree-listMichael Rappazzo2015-10-081-1/+48
* | Sixth batch for 2.7Junio C Hamano2015-10-201-1/+10
* | Sync with 2.6.2Junio C Hamano2015-10-162-1/+67
|\ \
| * | Git 2.6.2v2.6.2Junio C Hamano2015-10-162-1/+67
| * | Merge branch 'tk/doc-interpret-trailers-grammo' into maintJunio C Hamano2015-10-161-1/+1
| |\ \
| * \ \ Merge branch 'jk/asciidoctor-section-heading-markup-fix' into maintJunio C Hamano2015-10-162-2/+2
| |\ \ \
| * \ \ \ Merge branch 'nd/ls-remote-does-not-have-u-option' into maintJunio C Hamano2015-10-161-2/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'dt/log-follow-config' into maintJunio C Hamano2015-10-162-4/+10
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/notes-dwim-doc' into maintJunio C Hamano2015-10-162-3/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mm/keyid-docs' into maintJunio C Hamano2015-10-1610-29/+47
| |\ \ \ \ \ \ \
* | | | | | | | | Fifth batch for 2.7Junio C Hamano2015-10-161-1/+17
* | | | | | | | | Merge branch 'jc/doc-gc-prune-now'Junio C Hamano2015-10-161-2/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/gc: warn against --prune=<now>jc/doc-gc-prune-nowJunio C Hamano2015-10-141-2/+5
* | | | | | | | | | Fourth batch for 2.7Junio C Hamano2015-10-151-0/+78
* | | | | | | | | | Merge branch 'ls/p4-lfs'Junio C Hamano2015-10-151-0/+32
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-p4: add support for large file systemsLars Schneider2015-10-031-0/+32
* | | | | | | | | | | Merge branch 'tk/doc-interpret-trailers-grammo'Junio C Hamano2015-10-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | Documentation/interpret-trailers: Grammar fixtk/doc-interpret-trailers-grammoTobias Klauser2015-10-071-1/+1
* | | | | | | | | | | Merge branch 'dt/log-follow-config'Junio C Hamano2015-10-152-4/+10
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | log: Update log.follow doc and add to config.txtdt/log-follow-configEric N. Vander Weele2015-10-072-4/+10
* | | | | | | | | | | Merge branch 'kn/for-each-branch'Junio C Hamano2015-10-151-1/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | branch: add '--points-at' optionKarthik Nayak2015-09-251-1/+5
| * | | | | | | | | | | branch.c: use 'ref-filter' APIsKarthik Nayak2015-09-251-1/+11
* | | | | | | | | | | | Third batch for 2.7Junio C Hamano2015-10-141-0/+8
* | | | | | | | | | | | Merge branch 'nd/ls-remote-does-not-have-u-option'Junio C Hamano2015-10-141-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | ls-remote.txt: delete unsupported optionnd/ls-remote-does-not-have-u-optionNguyễn Thái Ngọc Duy2015-09-281-2/+1
* | | | | | | | | | | | Merge branch 'jk/asciidoctor-section-heading-markup-fix'Junio C Hamano2015-10-142-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | Documentation: fix section header mark-upjk/asciidoctor-section-heading-markup-fixJohn Keeping2015-09-252-2/+2
* | | | | | | | | | | | Merge branch 'jk/notes-dwim-doc'Junio C Hamano2015-10-142-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | notes: correct documentation of DWIMery for notes referencesjk/notes-dwim-docJacob Keller2015-09-222-3/+6
* | | | | | | | | | | | Second batch for 2.7Junio C Hamano2015-10-071-0/+16
* | | | | | | | | | | | Merge branch 'ls/p4-path-encoding'Junio C Hamano2015-10-071-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-p4: add config git-p4.pathEncodingLars Schneider2015-09-031-0/+7
* | | | | | | | | | | | | Merge branch 'nd/ignore-then-not-ignore'Junio C Hamano2015-10-071-4/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | dir.c: don't exclude whole dir prematurely if neg pattern may matchnd/ignore-then-not-ignoreNguyễn Thái Ngọc Duy2015-09-211-4/+19
* | | | | | | | | | | | | | Start cycle toward 2.7Junio C Hamano2015-10-051-0/+109
* | | | | | | | | | | | | | Sync with 2.6.1Junio C Hamano2015-10-055-4/+107
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Git 2.6.1v2.6.1Junio C Hamano2015-09-282-1/+20
| * | | | | | | | | | | | | Sync with v2.5.4Junio C Hamano2015-09-284-3/+87
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Git 2.5.4v2.5.4Junio C Hamano2015-09-282-1/+20
| | * | | | | | | | | | | | | Sync with 2.4.10Junio C Hamano2015-09-283-2/+67
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Git 2.4.10v2.4.10Junio C Hamano2015-09-282-1/+20
| | | * | | | | | | | | | | | Sync with 2.3.10Junio C Hamano2015-09-282-1/+47
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | Git 2.3.10v2.3.10maint-2.3Junio C Hamano2015-09-282-1/+20
| | | | * | | | | | | | | | | http: limit redirection to protocol-whitelistBlake Burkhart2015-09-251-5/+0
| | | | * | | | | | | | | | | transport: add a protocol-whitelist environment variableJeff King2015-09-231-0/+32
| | | | |/ / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'mm/keyid-docs'Junio C Hamano2015-10-0510-29/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Documentation: explain optional arguments bettermm/keyid-docsMatthieu Moy2015-09-219-10/+28