summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
|\ \ \ \
| * | | | commit: check committer identity more strictlyJeff King2012-07-231-1/+1
| |/ / /
* | | | Merge branch 'jk/maint-checkout-orphan-check-fix' into maintJunio C Hamano2012-08-061-1/+1
|\ \ \ \
| * | | | checkout: don't confuse ref and object flagsJeff King2012-07-251-1/+1
* | | | | Merge branch 'kk/maint-commit-tree' into maintJunio C Hamano2012-07-301-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 'ar/clone-honor-umask-at-top' into maintJunio C Hamano2012-07-222-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 'cw/amend-commit-without-message' into maintJunio C Hamano2012-07-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Allow edit of empty message with commit --amendChris Webb2012-07-091-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
|\ \ \ \ \ \ \
| * | | | | | | show: fix "range implies walking"Junio C Hamano2012-06-191-0/+3
* | | | | | | | Merge branch 'js/fast-export-paths-with-spaces' into maintJunio C Hamano2012-07-221-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | fast-export: quote paths with spacesJay Soffian2012-06-271-0/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'cw/no-detaching-an-unborn' into maintJunio C Hamano2012-07-221-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | git-checkout: disallow --detach on unborn branchChris Webb2012-06-261-0/+2
* | | | | | | | | Merge branch 'jc/maint-blame-unique-abbrev' into maintJunio C Hamano2012-07-111-4/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | blame: compute abbreviation width that ensures uniquenessJunio C Hamano2012-07-021-4/+21
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'rj/platform-pread-may-be-thread-unsafe' into maintJunio C Hamano2012-07-111-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | index-pack: Disable threading on cygwinJunio C Hamano2012-06-261-2/+2
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'nd/clone-single-fix' into maintJunio C Hamano2012-07-111-2/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | clone: fix ref selection in --single-branch --branch=xxxNguyễn Thái Ngọc Duy2012-06-221-2/+5
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'js/maint-fast-export-mark-error' into maintJunio C Hamano2012-06-171-1/+1
* | | | | | | | | Merge branch 'hv/submodule-update-nuke-submodules' into maintJunio C Hamano2012-07-111-6/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | update-index: allow overwriting existing submodule index entriesHeiko Voigt2012-06-111-6/+0
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/diff-no-index-pager' into maintJunio C Hamano2012-07-111-7/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix pager.diff with diff --no-indexJeff King2012-06-151-7/+17
| |/ / / / / / / /
| * | | | | | | | Merge branch 'rs/maint-grep-F' into maintJunio C Hamano2012-06-011-5/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ap/checkout-no-progress-for-non-tty' into maintJunio C Hamano2012-06-011-2/+2
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'mm/verify-filename-fix' into maintJunio C Hamano2012-07-113-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | verify_filename(): ask the caller to chose the kind of diagnosisMatthieu Moy2012-06-183-4/+4
* | | | | | | | | | | | Merge branch 'jc/ls-files-i-dir' into maintJunio C Hamano2012-07-112-7/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | builtin/add.c: use path_excluded()Junio C Hamano2012-06-051-1/+5
| * | | | | | | | | | | path_excluded(): update API to less cache-entry centricJunio C Hamano2012-06-051-2/+8
| * | | | | | | | | | | ls-files -i: pay attention to exclusion of leading pathsJunio C Hamano2012-06-031-6/+11
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/fmt-merge-msg-people'Junio C Hamano2012-06-121-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fmt-merge-msg: make attribution into comment linesJunio C Hamano2012-06-061-2/+2