summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2012-09-143-48/+117
|\
| * Draft release notes to 1.7.12.1Junio C Hamano2012-09-141-47/+69
| * Merge branch 'mz/cherry-pick-cmdline-order' into maintJunio C Hamano2012-09-141-4/+8
| |\
| * \ Sync with 1.7.11.7Junio C Hamano2012-09-144-2/+78
| |\ \
| | * | Git 1.7.11.7v1.7.11.7maint-1.7.11Junio C Hamano2012-09-142-1/+48
| | * | Merge branch 'jc/maint-checkout-fileglob-doc' into maint-1.7.11Junio C Hamano2012-09-142-1/+30
| | |\ \
* | | | | The sixth batch for 1.8.0Junio C Hamano2012-09-141-0/+13
* | | | | Merge branch 'sn/ls-remote-get-url-doc'Junio C Hamano2012-09-141-0/+5
|\ \ \ \ \
| * | | | | ls-remote: document the '--get-url' optionStefan Naewe2012-09-071-0/+5
* | | | | | Start merging the sixth batch for 1.8.0Junio C Hamano2012-09-121-33/+18
* | | | | | Merge branch 'maint'Junio C Hamano2012-09-121-0/+26
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Further merging in preparation for 1.7.12.1Junio C Hamano2012-09-121-0/+26
| * | | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-122-3/+10
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11Junio C Hamano2012-09-121-0/+7
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name' into maint-1....Junio C Hamano2012-09-121-3/+3
| | |\ \ \ \ \
* | | \ \ \ \ \ Merge branch 'jc/maint-checkout-fileglob-doc'Junio C Hamano2012-09-122-1/+30
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | gitcli: contrast wildcard given to shell and to gitJunio C Hamano2012-09-101-0/+17
| * | | | | | | gitcli: formatting fixJunio C Hamano2012-09-101-1/+1
| * | | | | | | Document file-glob for "git checkout -- '*.c'"Junio C Hamano2012-09-041-0/+12
* | | | | | | | Merge branch 'nd/maint-remote-remove'Junio C Hamano2012-09-121-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | remote: prefer subcommand name 'remove' to 'rm'Nguyễn Thái Ngọc Duy2012-09-061-1/+2
* | | | | | | | | Merge branch 'nd/log-n-doc'Junio C Hamano2012-09-122-5/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: move rev-list option -<n> from git-log.txt to rev-list-options.txtNguyễn Thái Ngọc Duy2012-09-062-5/+4
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Second half of the fifth batch for 1.8.0Junio C Hamano2012-09-111-45/+17
* | | | | | | | | Merge branch 'jk/argv-array'Junio C Hamano2012-09-111-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | argv-array: add pop functionJeff King2012-09-021-0/+4
* | | | | | | | | | Merge branch 'jc/merge-bases'Junio C Hamano2012-09-111-0/+28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | merge-base: "--is-ancestor A B"Junio C Hamano2012-08-311-0/+28
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Sync with maintJunio C Hamano2012-09-113-34/+70
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Further merging down for 1.7.12.1Junio C Hamano2012-09-111-0/+13
| * | | | | | | | | Sync with 1.7.11.6Junio C Hamano2012-09-116-44/+74
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | Git 1.7.11.6v1.7.11.6Junio C Hamano2012-09-112-34/+57
| | * | | | | | | | Merge branch 'sz/submodule-force-update' into maint-1.7.11Junio C Hamano2012-09-111-1/+8
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'jc/maint-config-exit-status' into maint-1.7.11Junio C Hamano2012-09-111-4/+4
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11Junio C Hamano2012-09-111-2/+2
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11Junio C Hamano2012-09-112-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/doc-git-updates' into maintJunio C Hamano2012-09-111-28/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/check-docs-update' into maintJunio C Hamano2012-09-114-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | First half of the fifth batch for 1.8.0Junio C Hamano2012-09-101-0/+24
* | | | | | | | | | | | | | | | Merge branch 'cn/branch-set-upstream-to'Junio C Hamano2012-09-101-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | branch: add --unset-upstream optionCarlos Martín Nieto2012-08-301-0/+5
| * | | | | | | | | | | | | | | | branch: introduce --set-upstream-toCarlos Martín Nieto2012-08-231-1/+8
* | | | | | | | | | | | | | | | | Merge branch 'mz/cherry-pick-cmdline-order'Junio C Hamano2012-09-101-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | teach log --no-walk=unsorted, which avoids sortingMartin von Zweigbergk2012-08-301-3/+8
* | | | | | | | | | | | | | | | | Cull items fixed in maintenance branchesJunio C Hamano2012-09-101-38/+0
* | | | | | | | | | | | | | | | | Sync with "almost" 1.7.12.1Junio C Hamano2012-09-102-1/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Start preparing for 1.7.12.1Junio C Hamano2012-09-101-0/+62
| * | | | | | | | | | | | | | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-101-1/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | / / / | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Almost 1.7.11.6Junio C Hamano2012-09-101-1/+29
* | | | | | | | | | | | | | | | The fourth batch for 1.8.0Junio C Hamano2012-09-071-0/+52