summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/git-dir-lookup'Junio C Hamano2012-02-141-2/+2
|\
| * standardize and improve lookup rules for external local reposjk/git-dir-lookupJeff King2012-02-021-2/+2
* | Merge branch 'jk/grep-binary-attribute'Junio C Hamano2012-02-141-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/pack-objects-parseopt'Junio C Hamano2012-02-141-190/+140
|\ \ \
| * | | pack-objects: convert to use parse_options()nd/pack-objects-parseoptNguyễn Thái Ngọc Duy2012-02-011-176/+139
| * | | pack-objects: remove bogus commentNguyễn Thái Ngọc Duy2012-02-011-14/+1
| * | | pack-objects: do not accept "--index-version=version,"Nguyễn Thái Ngọc Duy2012-02-011-1/+1
| |/ /
* | | Merge branch 'mh/war-on-extra-refs'Junio C Hamano2012-02-142-42/+32
|\ \ \
| * | | clone: do not add alternate references to extra_refsMichael Haggerty2012-02-121-12/+0
| * | | everything_local(): mark alternate refs as completeMichael Haggerty2012-02-121-0/+6
| * | | fetch-pack.c: inline insert_alternate_refs()Michael Haggerty2012-02-121-6/+1
| * | | fetch-pack.c: rename some parameters from "path" to "refname"Michael Haggerty2012-02-121-5/+5
| * | | clone.c: move more code into the "if (refs)" conditionalMichael Haggerty2012-02-121-19/+20
* | | | Merge branch 'jk/userdiff-config-simplify'Junio C Hamano2012-02-143-19/+4
|\ \ \ \
| * | | | drop odd return value semantics from userdiff_configjk/userdiff-config-simplifyJeff King2012-02-073-19/+4
* | | | | Merge branch 'jc/checkout-out-of-unborn'Junio C Hamano2012-02-121-0/+19
|\ \ \ \ \
| * | | | | git checkout -b: allow switching out of an unborn branchjc/checkout-out-of-unbornJunio C Hamano2012-02-061-0/+19
* | | | | | Merge branch 'nd/diffstat-gramnum'Junio C Hamano2012-02-121-1/+2
|\ \ \ \ \ \
| * | | | | | Use correct grammar in diffstat summary linend/diffstat-gramnumNguyễn Thái Ngọc Duy2012-02-031-1/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'nd/cache-tree-api-refactor'Junio C Hamano2012-02-121-2/+2
|\ \ \ \ \ \
| * | | | | | cache-tree: update API to take abitrary flagsnd/cache-tree-api-refactorNguyễn Thái Ngọc Duy2012-02-071-2/+2
| |/ / / / /
* | | | | | Merge branch 'jk/maint-tag-show-fixes'Junio C Hamano2012-02-121-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'Junio C Hamano2012-02-121-1/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | 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'Junio C Hamano2012-02-101-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'Junio C Hamano2012-02-101-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'Junio C Hamano2012-02-101-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'Junio C Hamano2012-02-101-0/+15
|\ \ \ \ \ \
| * | | | | | branch --edit-description: protect against mistyped branch namejc/branch-desc-typoavoidanceJunio C Hamano2012-02-051-0/+15
| |/ / / / /
* | | | | | Merge branch 'jx/i18n-more-marking'Junio C Hamano2012-02-071-3/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | i18n: git-commit whence_s "merge/cherry-pick" messageJiang Xin2012-02-011-3/+3
| |/ / / /
* | | | | Merge branch 'tr/merge-edit-guidance'Junio C Hamano2012-01-311-0/+10
|\ \ \ \ \
| * | | | | merge: add instructions to the commit message when editingtr/merge-edit-guidanceThomas Rast2012-01-311-0/+10
| |/ / / /
* | | | | Merge branch 'jc/pull-signed-tag'Junio C Hamano2012-01-311-4/+34
|\ \ \ \ \
| * | | | | merge: use editor by default in interactive sessionsJunio C Hamano2012-01-231-4/+34
* | | | | | Merge branch 'nd/clone-detached'Junio C Hamano2012-01-312-140/+183
|\ \ \ \ \ \
| * | | | | | clone: fix up delay cloning conditionsNguyễn Thái Ngọc Duy2012-01-242-8/+14
| * | | | | | push: do not let configured foreign-vcs permanently clobberedJunio C Hamano2012-01-231-0/+2
| * | | | | | clone: print advice on checking out detached HEADNguyễn Thái Ngọc Duy2012-01-162-16/+5
| * | | | | | clone: allow --branch to take a tagNguyễn Thái Ngọc Duy2012-01-161-1/+19
View Lorry Controller Status