summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-123-28/+60
|\
| * Merge branch 'jc/apply-binary-p0' into maint-1.7.11Junio C Hamano2012-09-121-25/+43
| |\
| | * apply: compute patch->def_name correctly under -p0Junio C Hamano2012-08-241-25/+43
| * | Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11Junio C Hamano2012-09-121-2/+14
| |\ \
| | * | specifying ranges: we did not mean to make ".." an empty setJunio C Hamano2012-08-231-2/+14
| * | | Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11Junio C Hamano2012-09-121-1/+3
| |\ \ \
| | * | | for-each-ref: Fix sort with multiple keysKacper Kornet2012-08-211-1/+3
* | | | | Sync with 1.7.11.6Junio C Hamano2012-09-116-15/+12
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'jc/maint-config-exit-status' into maint-1.7.11Junio C Hamano2012-09-111-2/+6
| |\ \ \ \
| | * | | | config: "git config baa" should exit with status 1Junio C Hamano2012-07-301-2/+6
| * | | | | Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-114-12/+6
| |\ \ \ \ \
| | * | | | | diff_setup_done(): return voidThomas Rast2012-08-034-12/+6
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11Junio C Hamano2012-09-111-1/+0
| |\ \ \ \ \
| | * | | | | apply: delete unused deflate_origlen from patch structPaul Gortmaker2012-08-051-1/+0
* | | | | | | Merge branch 'jc/capabilities' into maintJunio C Hamano2012-09-113-5/+36
|\ \ \ \ \ \ \
| * | | | | | | fetch-pack: mention server version with verbose outputJeff King2012-08-131-1/+8
| * | | | | | | fetch-pack: do not ask for unadvertised capabilitiesJunio C Hamano2012-08-101-0/+6
| * | | | | | | do not send client agent unless server does firstJeff King2012-08-102-4/+15
| * | | | | | | send-pack: fix capability-sending logicJeff King2012-08-101-1/+1
| * | | | | | | include agent identifier in capability stringJeff King2012-08-033-4/+11
* | | | | | | | Merge branch 'bc/prune-info' into maintJunio C Hamano2012-09-101-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | prune.c: only print informational message in show_only or verbose modeBrandon Casey2012-08-071-1/+2
* | | | | | | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-104-8/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11Junio C Hamano2012-09-101-1/+2
| |\ \ \ \ \ \ \
| | * | | | | | | receive-pack: do not leak output from auto-gc to standard outputJunio C Hamano2012-08-061-1/+2
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-103-7/+12
| |\ \ \ \ \ \ \
| | * | | | | | | diff: do not use null sha1 as a sentinel valueJeff King2012-07-293-7/+12
| | |/ / / / / /
| * | | | | | | Merge branch 'jk/maint-commit-check-committer-early' into maint-1.7.11Junio C Hamano2012-08-241-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge branch 'jk/maint-checkout-orphan-check-fix' into maintJunio C Hamano2012-08-061-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'kk/maint-commit-tree' into maintJunio C Hamano2012-07-301-3/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ar/clone-honor-umask-at-top' into maintJunio C Hamano2012-07-222-2/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'cw/amend-commit-without-message' into maintJunio C Hamano2012-07-221-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merge branch 'jk/maint-commit-amend-only-no-paths' into maintJunio C Hamano2012-07-221-1/+4
| * | | | | | | | | | | Merge branch 'tr/maint-show-walk' into maintJunio C Hamano2012-07-221-0/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/fast-export-paths-with-spaces' into maintJunio C Hamano2012-07-221-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cw/no-detaching-an-unborn' into maintJunio C Hamano2012-07-221-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-blame-unique-abbrev' into maintJunio C Hamano2012-07-111-4/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/platform-pread-may-be-thread-unsafe' into maintJunio C Hamano2012-07-111-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/clone-single-fix' into maintJunio C Hamano2012-07-111-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hv/submodule-update-nuke-submodules' into maintJunio C Hamano2012-07-111-6/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-no-index-pager' into maintJunio C Hamano2012-07-111-7/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/verify-filename-fix' into maintJunio C Hamano2012-07-113-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/ls-files-i-dir' into maintJunio C Hamano2012-07-112-7/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-checkout-orphan-check-fix'Junio C Hamano2012-07-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | checkout: don't confuse ref and object flagsJeff King2012-07-251-1/+1
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-commit-check-committer-early'Junio C Hamano2012-07-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | commit: check committer identity more strictlyJeff King2012-07-231-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'kk/maint-commit-tree'Junio C Hamano2012-07-231-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-treeJunio C Hamano2012-07-171-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | commit-tree: resurrect command line parsing updatesJunio C Hamano2012-07-171-3/+0
View Lorry Controller Status