Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2012-09-14 | 3 | -48/+117 |
|\ | |||||
| * | Draft release notes to 1.7.12.1 | Junio C Hamano | 2012-09-14 | 1 | -47/+69 |
| * | Merge branch 'mz/cherry-pick-cmdline-order' into maint | Junio C Hamano | 2012-09-14 | 1 | -4/+8 |
| |\ | |||||
| * \ | Sync with 1.7.11.7 | Junio C Hamano | 2012-09-14 | 4 | -2/+78 |
| |\ \ | |||||
| | * | | Git 1.7.11.7v1.7.11.7maint-1.7.11 | Junio C Hamano | 2012-09-14 | 2 | -1/+48 |
| | * | | Merge branch 'jc/maint-checkout-fileglob-doc' into maint-1.7.11 | Junio C Hamano | 2012-09-14 | 2 | -1/+30 |
| | |\ \ | |||||
* | | | | | The sixth batch for 1.8.0 | Junio C Hamano | 2012-09-14 | 1 | -0/+13 |
* | | | | | Merge branch 'sn/ls-remote-get-url-doc' | Junio C Hamano | 2012-09-14 | 1 | -0/+5 |
|\ \ \ \ \ | |||||
| * | | | | | ls-remote: document the '--get-url' option | Stefan Naewe | 2012-09-07 | 1 | -0/+5 |
* | | | | | | Start merging the sixth batch for 1.8.0 | Junio C Hamano | 2012-09-12 | 1 | -33/+18 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-09-12 | 1 | -0/+26 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Further merging in preparation for 1.7.12.1 | Junio C Hamano | 2012-09-12 | 1 | -0/+26 |
| * | | | | | Merge branch 'maint-1.7.11' into maint | Junio C Hamano | 2012-09-12 | 2 | -3/+10 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11 | Junio C Hamano | 2012-09-12 | 1 | -0/+7 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name' into maint-1.... | Junio C Hamano | 2012-09-12 | 1 | -3/+3 |
| | |\ \ \ \ \ | |||||
* | | \ \ \ \ \ | Merge branch 'jc/maint-checkout-fileglob-doc' | Junio C Hamano | 2012-09-12 | 2 | -1/+30 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | gitcli: contrast wildcard given to shell and to git | Junio C Hamano | 2012-09-10 | 1 | -0/+17 |
| * | | | | | | | gitcli: formatting fix | Junio C Hamano | 2012-09-10 | 1 | -1/+1 |
| * | | | | | | | Document file-glob for "git checkout -- '*.c'" | Junio C Hamano | 2012-09-04 | 1 | -0/+12 |
* | | | | | | | | Merge branch 'nd/maint-remote-remove' | Junio C Hamano | 2012-09-12 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | remote: prefer subcommand name 'remove' to 'rm' | Nguyễn Thái Ngọc Duy | 2012-09-06 | 1 | -1/+2 |
* | | | | | | | | | Merge branch 'nd/log-n-doc' | Junio C Hamano | 2012-09-12 | 2 | -5/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | doc: move rev-list option -<n> from git-log.txt to rev-list-options.txt | Nguyễn Thái Ngọc Duy | 2012-09-06 | 2 | -5/+4 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Second half of the fifth batch for 1.8.0 | Junio C Hamano | 2012-09-11 | 1 | -45/+17 |
* | | | | | | | | | Merge branch 'jk/argv-array' | Junio C Hamano | 2012-09-11 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | argv-array: add pop function | Jeff King | 2012-09-02 | 1 | -0/+4 |
* | | | | | | | | | | Merge branch 'jc/merge-bases' | Junio C Hamano | 2012-09-11 | 1 | -0/+28 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | merge-base: "--is-ancestor A B" | Junio C Hamano | 2012-08-31 | 1 | -0/+28 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Sync with maint | Junio C Hamano | 2012-09-11 | 3 | -34/+70 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Further merging down for 1.7.12.1 | Junio C Hamano | 2012-09-11 | 1 | -0/+13 |
| * | | | | | | | | | Sync with 1.7.11.6 | Junio C Hamano | 2012-09-11 | 6 | -44/+74 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Git 1.7.11.6v1.7.11.6 | Junio C Hamano | 2012-09-11 | 2 | -34/+57 |
| | * | | | | | | | | Merge branch 'sz/submodule-force-update' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -1/+8 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-config-exit-status' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 2 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/doc-git-updates' into maint | Junio C Hamano | 2012-09-11 | 1 | -28/+32 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/check-docs-update' into maint | Junio C Hamano | 2012-09-11 | 4 | -3/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | First half of the fifth batch for 1.8.0 | Junio C Hamano | 2012-09-10 | 1 | -0/+24 |
* | | | | | | | | | | | | | | | | Merge branch 'cn/branch-set-upstream-to' | Junio C Hamano | 2012-09-10 | 1 | -1/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | branch: add --unset-upstream option | Carlos Martín Nieto | 2012-08-30 | 1 | -0/+5 |
| * | | | | | | | | | | | | | | | | branch: introduce --set-upstream-to | Carlos Martín Nieto | 2012-08-23 | 1 | -1/+8 |
* | | | | | | | | | | | | | | | | | Merge branch 'mz/cherry-pick-cmdline-order' | Junio C Hamano | 2012-09-10 | 1 | -4/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | teach log --no-walk=unsorted, which avoids sorting | Martin von Zweigbergk | 2012-08-30 | 1 | -3/+8 |
* | | | | | | | | | | | | | | | | | Cull items fixed in maintenance branches | Junio C Hamano | 2012-09-10 | 1 | -38/+0 |
* | | | | | | | | | | | | | | | | | Sync with "almost" 1.7.12.1 | Junio C Hamano | 2012-09-10 | 2 | -1/+91 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Start preparing for 1.7.12.1 | Junio C Hamano | 2012-09-10 | 1 | -0/+62 |
| * | | | | | | | | | | | | | | | | Merge branch 'maint-1.7.11' into maint | Junio C Hamano | 2012-09-10 | 1 | -1/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | / / / | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Almost 1.7.11.6 | Junio C Hamano | 2012-09-10 | 1 | -1/+29 |
* | | | | | | | | | | | | | | | | The fourth batch for 1.8.0 | Junio C Hamano | 2012-09-07 | 1 | -0/+52 |