summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | | | | | | | | Merge branch 'tg/ce-namelen-field'Junio C Hamano2012-07-234-7/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Strip namelen out of ce_flags into a ce_namelen fieldThomas Gummerer2012-07-114-6/+12
* | | | | | | | | | | | | | | | | | Merge branch 'mm/config-xdg'Junio C Hamano2012-07-221-4/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | config: fix several access(NULL) callsMatthieu Moy2012-07-161-4/+12
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/sha1-name-more'Junio C Hamano2012-07-227-11/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | rev-parse --disambiguate=<prefix>Junio C Hamano2012-07-091-0/+10
| * | | | | | | | | | | | | | | | | | | rev-parse: A and B in "rev-parse A..B" refer to committishJunio C Hamano2012-07-091-2/+2
| * | | | | | | | | | | | | | | | | | | reset: the command takes committishJunio C Hamano2012-07-091-2/+8
| * | | | | | | | | | | | | | | | | | | commit-tree: the command wants a tree and commitsJunio C Hamano2012-07-091-4/+4
| * | | | | | | | | | | | | | | | | | | apply: --build-fake-ancestor expects blobsJunio C Hamano2012-07-091-1/+1
| * | | | | | | | | | | | | | | | | | | revision.c: the "log" family, except for "show", takes committishJunio C Hamano2012-07-091-0/+3
| * | | | | | | | | | | | | | | | | | | revision.c: allow handle_revision_arg() to take other flagsJunio C Hamano2012-07-091-1/+1
| * | | | | | | | | | | | | | | | | | | sha1_name.c: teach lookup context to get_sha1_with_context()Junio C Hamano2012-07-091-1/+1
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/index-pack-streaming-fix'Junio C Hamano2012-07-151-10/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | index-pack: loop while inflating objects in unpack_dataJeff King2012-07-101-10/+13
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-commit-amend-only-no-paths'Junio C Hamano2012-07-151-1/+4
* | | | | | | | | | | | | | | | | | | | | Merge branch 'cw/amend-commit-without-message'Junio C Hamano2012-07-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Allow edit of empty message with commit --amendChris Webb2012-07-091-1/+1
| | |_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'ar/clone-honor-umask-at-top'Junio C Hamano2012-07-152-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | add: create ADD_EDIT.patch with mode 0666Jeff King2012-07-091-1/+1
| * | | | | | | | | | | | | | | | | | | Restore umasks influence on the permissions of work tree created by cloneAlex Riesen2012-07-091-1/+1
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/apply-3way'Junio C Hamano2012-07-151-117/+440
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \