summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/symbolic-ref-short'Junio C Hamano2012-03-041-3/+8
|\
| * symbolic-ref --short: abbreviate the output unambiguouslyjk/symbolic-ref-shortJan Krüger2012-02-271-3/+8
* | Merge branch 'cb/fsck-squelch-dangling'Junio C Hamano2012-03-011-2/+5
|\ \
| * | fsck: --no-dangling omits "dangling object" informationcb/fsck-squelch-danglingJunio C Hamano2012-02-281-2/+5
* | | Merge branch 'rs/no-no-no-parseopt'Junio C Hamano2012-03-012-6/+3
|\ \ \
| * | | parse-options: remove PARSE_OPT_NEGHELPrs/no-no-no-parseoptRené Scharfe2012-02-282-5/+3
* | | | Merge branch 'nd/maint-verify-objects'Junio C Hamano2012-03-011-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 'cn/maint-branch-with-bad'Junio C Hamano2012-03-011-0/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | branch: don't assume the merge filter ref existscn/maint-branch-with-badCarlos Martín Nieto2012-02-271-0/+4
* | | | | Merge branch 'fc/push-prune'Junio C Hamano2012-02-261-0/+2
|\ \ \ \ \
| * | | | | push: add '--prune' optionfc/push-pruneFelipe Contreras2012-02-221-0/+2
* | | | | | pack-objects: Fix compilation with NO_PTHREDSMichał Kiedrowicz2012-02-261-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'jk/config-include'Junio C Hamano2012-02-231-33/+63
|\ \ \ \ \
| * | | | | config: add include directiveJeff King2012-02-171-10/+28
| * | | | | config: stop using config_exclusive_filenameJeff King2012-02-171-24/+35
| * | | | | config: copy the return value of prefix_filenameJeff King2012-02-171-3/+4
* | | | | | Merge branch 'pj/remote-set-branches-usage-fix'Junio C Hamano2012-02-231-1/+1
|\ \ \ \ \ \
| * | | | | | remote: fix set-branches usage and documentationpj/remote-set-branches-usage-fixPhilip Jägenstedt2012-02-191-1/+1
* | | | | | | merge: do not trust fstat(2) too much when checking interactivenessJunio C Hamano2012-02-231-1/+1
* | | | | | | Merge branch 'tg/tag-points-at'Junio C Hamano2012-02-201-1/+49
|\ \ \ \ \ \ \
| * | | | | | | builtin/tag.c: Fix a sparse warningtg/tag-points-atRamsay Jones2012-02-131-1/+1
| * | | | | | | tag: add --points-at list optionTom Grennan2012-02-081-1/+49
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'zj/decimal-width'Junio C Hamano2012-02-201-15/+3
|\ \ \ \ \ \ \
| * | | | | | | make lineno_width() from blame reusable for otherszj/decimal-widthZbigniew Jędrzejewski-Szmek2012-02-141-15/+3
* | | | | | | | Merge branch 'cb/transfer-no-progress'Junio C Hamano2012-02-205-16/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | push/fetch/clone --no-progress suppresses progress outputcb/transfer-no-progressClemens Buchacher2012-02-135-16/+18
| |/ / / / / / /
| * | | | | | | Merge branch 'js/add-e-submodule-fix' into maintJunio C Hamano2012-02-131-0/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/parse-date-raw' into maintJunio C Hamano2012-02-131-0/+6
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maintJunio C Hamano2012-02-131-1/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/branch-desc-typoavoidance' into maintJunio C Hamano2012-02-131-0/+15
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/grep-l-with-decoration' into maintJunio C Hamano2012-02-101-2/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/push-quiet' into maintJunio C Hamano2012-02-052-7/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'cb/receive-pack-keep-errors'Junio C Hamano2012-02-201-7/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | do not override receive-pack errorscb/receive-pack-keep-errorsClemens Buchacher2012-02-131-7/+17
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'cb/maint-rev-list-verify-object'Junio C Hamano2012-02-201-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | git rev-list: fix invalid typecastcb/maint-rev-list-verify-objectClemens Buchacher2012-02-131-2/+2
| |/ / / / / / / / / /
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status