summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* diff: do not use null sha1 as a sentinel valueJeff King2012-07-293-7/+12
* Merge branch 'jc/maint-merge-autoedit' into maintJunio C Hamano2012-04-021-1/+28
|\
| * merge: backport GIT_MERGE_AUTOEDIT supportjc/maint-merge-autoeditJunio C Hamano2012-03-201-1/+28
* | Merge branch 'maint-1.7.8' into maintJunio C Hamano2012-03-201-5/+4
|\ \ | |/ |/|
| * Merge branch 'jc/advise-i18n' into maint-1.7.8Junio C Hamano2012-03-201-5/+4
| |\
| | * i18n of multi-line advice messagesjc/advise-i18nJunio C Hamano2011-12-221-5/+4
* | | Merge branch 'cn/maint-branch-with-bad' into maintJunio C Hamano2012-03-041-0/+4
|\ \ \
| * | | branch: don't assume the merge filter ref existscn/maint-branch-with-badCarlos Martín Nieto2012-02-271-0/+4
| |/ /
* | | Merge branch 'nd/maint-verify-objects' into maintJunio C Hamano2012-03-041-22/+16
|\ \ \
| * | | rev-list: fix --verify-objects --quiet becoming --objectsnd/maint-verify-objectsNguyễn Thái Ngọc Duy2012-02-281-11/+15
| * | | rev-list: remove BISECT_SHOW_TRIED flagNguyễn Thái Ngọc Duy2012-02-281-11/+1
* | | | Merge branch 'pj/remote-set-branches-usage-fix' into maintJunio C Hamano2012-02-271-1/+1
|\ \ \ \
| * | | | remote: fix set-branches usage and documentationpj/remote-set-branches-usage-fixPhilip Jägenstedt2012-02-191-1/+1
* | | | | Merge branch 'tr/merge-edit-guidance' into maintJunio C Hamano2012-02-271-0/+10
|\ \ \ \ \
| * | | | | merge: add instructions to the commit message when editingtr/merge-edit-guidanceThomas Rast2012-01-311-0/+10
* | | | | | Merge branch 'cb/receive-pack-keep-errors' into maintJunio C Hamano2012-02-211-7/+17
|\ \ \ \ \ \
| * | | | | | do not override receive-pack errorscb/receive-pack-keep-errorsClemens Buchacher2012-02-131-7/+17
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'cb/transfer-no-progress' into maintJunio C Hamano2012-02-215-16/+18
|\ \ \ \ \ \
| * | | | | | push/fetch/clone --no-progress suppresses progress outputcb/transfer-no-progressClemens Buchacher2012-02-135-16/+18
* | | | | | | Merge branch 'jk/git-dir-lookup' into maintJunio C Hamano2012-02-211-2/+2
|\ \ \ \ \ \ \
| * | | | | | | standardize and improve lookup rules for external local reposjk/git-dir-lookupJeff King2012-02-021-2/+2
* | | | | | | | Merge branch 'cb/maint-rev-list-verify-object' into maintJunio C Hamano2012-02-211-2/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | git rev-list: fix invalid typecastcb/maint-rev-list-verify-objectClemens Buchacher2012-02-131-2/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/grep-binary-attribute' into maintJunio C Hamano2012-02-211-144/+33
|\ \ \ \ \ \ \
| * | | | | | | grep: pre-load userdiff drivers when threadedjk/grep-binary-attributeJeff King2012-02-021-4/+6
| * | | | | | | convert git-grep to use grep_source interfaceJeff King2012-02-021-119/+23
| * | | | | | | grep: move sha1-reading mutex into low-level codeJeff King2012-02-021-23/+6
| * | | | | | | grep: make locking flag globalJeff King2012-02-021-2/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'nd/diffstat-gramnum' into maintJunio C Hamano2012-02-211-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Use correct grammar in diffstat summary linend/diffstat-gramnumNguyễn Thái Ngọc Duy2012-02-031-1/+2
| |/ / / / / /
* | | | | | | Merge branch 'jc/checkout-out-of-unborn' into maintJunio C Hamano2012-02-161-0/+19
|\ \ \ \ \ \ \
| * | | | | | | git checkout -b: allow switching out of an unborn branchjc/checkout-out-of-unbornJunio C Hamano2012-02-061-0/+19
* | | | | | | | Merge branch 'jx/i18n-more-marking' into maintJunio C Hamano2012-02-161-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | i18n: git-commit whence_s "merge/cherry-pick" messageJiang Xin2012-02-011-3/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/maint-tag-show-fixes' into maintJunio C Hamano2012-02-131-32/+40
|\ \ \ \ \ \ \ \
| * | | | | | | | tag: do not show non-tag contents with "-n"jk/maint-tag-show-fixesJunio C Hamano2012-02-081-10/+12
| * | | | | | | | tag: die when listing missing or corrupt objectsJeff King2012-02-061-1/+5
| * | | | | | | | tag: fix output of "tag -n" when errors occurJeff King2012-02-061-32/+34
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jn/merge-no-edit-fix' into maintJunio C Hamano2012-02-131-3/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | merge: do not launch an editor on "--no-edit $tag"jn/merge-no-edit-fixJunio C Hamano2012-02-091-3/+7
* | | | | | | | Merge branch 'js/add-e-submodule-fix' into maintJunio C Hamano2012-02-131-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | add -e: do not show difference in a submodule that is merely dirtyjs/add-e-submodule-fixJohannes Schindelin2012-02-071-0/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/parse-date-raw' into maintJunio C Hamano2012-02-131-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | parse_date(): '@' prefix forces git-timestampjc/parse-date-rawJunio C Hamano2012-02-031-0/+6
* | | | | | | | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maintJunio C Hamano2012-02-131-1/+2
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | merge: do not create a signed tag merge under --ff-only optionjc/merge-ff-only-stronger-than-signed-mergeJunio C Hamano2012-02-051-1/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/branch-desc-typoavoidance' into maintJunio C Hamano2012-02-131-0/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | branch --edit-description: protect against mistyped branch namejc/branch-desc-typoavoidanceJunio C Hamano2012-02-051-0/+15
| |/ / / / / / /
* | | | | | | | Merge branch 'tr/grep-l-with-decoration' into maintJunio C Hamano2012-02-101-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | grep: fix -l/-L interaction with decoration linestr/grep-l-with-decorationAlbert Yale2012-01-231-2/+3
View Lorry Controller Status