summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | | Merge branch 'nd/branch-v-alignment'Junio C Hamano2012-09-071-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | branch -v: align even when branch names are in UTF-8Nguyễn Thái Ngọc Duy2012-08-271-0/+2
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name'Junio C Hamano2012-09-071-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | doc: "git checkout -b/-B/--orphan" always takes a branch nameJunio C Hamano2012-08-261-3/+3
* | | | | | | | | | | | Merge branch 'jc/dotdot-is-parent-directory'Junio C Hamano2012-09-071-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | specifying ranges: we did not mean to make ".." an empty setJunio C Hamano2012-08-231-0/+7
* | | | | | | | | | | | | The third batch for 1.8.0Junio C Hamano2012-09-031-0/+45
* | | | | | | | | | | | | Merge branch 'sz/submodule-force-update'Junio C Hamano2012-09-031-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Make 'git submodule update --force' always check out submodules.Stefan Zager2012-08-241-1/+8
* | | | | | | | | | | | | Merge branch 'jc/daemon-access-hook'Junio C Hamano2012-09-031-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | daemon: --access-hook optionJunio C Hamano2012-08-151-0/+16
* | | | | | | | | | | | | | Merge branch 'cw/cherry-pick-allow-empty-message'Junio C Hamano2012-09-031-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | cherry-pick: add --allow-empty-message optionChris Webb2012-08-061-0/+5
* | | | | | | | | | | | | | | Merge branch 'jc/maint-config-exit-status'Junio C Hamano2012-09-031-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | config: "git config baa" should exit with status 1Junio C Hamano2012-07-301-4/+4
* | | | | | | | | | | | | | | Latter half of the second batch for 1.8.0Junio C Hamano2012-08-291-1/+30
* | | | | | | | | | | | | | | Merge branch 'mh/maint-config-doc-proxy-command'Junio C Hamano2012-08-291-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | git-config doc: unconfuse an exampleJunio C Hamano2012-08-181-1/+1
| * | | | | | | | | | | | | | git-config.txt: fix exampleMichael Haggerty2012-08-181-1/+1
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | First half of the second batch for 1.8.0Junio C Hamano2012-08-271-0/+37
* | | | | | | | | | | | | | Merge branch 'jk/docs-docbook-monospace-display'Junio C Hamano2012-08-272-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | docs: monospace listings in docbook outputJeff King2012-08-072-3/+3
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'da/difftool-updates'Junio C Hamano2012-08-272-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | mergetool,difftool: Document --tool-help consistentlyDavid Aguilar2012-08-102-3/+6
| * | | | | | | | | | | | | difftool: Use symlinks when diffing against the worktreeDavid Aguilar2012-07-231-0/+8
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'js/grep-patterntype-config'Junio C Hamano2012-08-272-2/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | grep: add a grep.patternType configuration settingJ Smith2012-08-032-2/+18
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-08-241-0/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
View Lorry Controller Status