aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'az/verify-tag-use-gpg-config'Junio C Hamano2012-03-12
|\
| * verify-tag: Parse GPG configuration options.Alex Zepeda2012-03-08
* | Merge branch 'kb/maint-prune-rmdir-closedir'Junio C Hamano2012-03-08
|\ \
| * | fix deletion of .git/objects sub-directories in git-prune/repackKarsten Blees2012-03-07
| * | Merge branch 'cn/maint-branch-with-bad' into maintJunio C Hamano2012-03-04
| |\ \
| * \ \ Merge branch 'nd/maint-verify-objects' into maintJunio C Hamano2012-03-04
| |\ \ \
| * \ \ \ Merge branch 'pj/remote-set-branches-usage-fix' into maintJunio C Hamano2012-02-27
| |\ \ \ \
| * \ \ \ \ Merge branch 'tr/merge-edit-guidance' into maintJunio C Hamano2012-02-27
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cb/receive-pack-keep-errors' into maintJunio C Hamano2012-02-21
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'cb/transfer-no-progress' into maintJunio C Hamano2012-02-21
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/git-dir-lookup' into maintJunio C Hamano2012-02-21
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'cb/maint-rev-list-verify-object' into maintJunio C Hamano2012-02-21
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/grep-binary-attribute' into maintJunio C Hamano2012-02-21
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/diffstat-gramnum' into maintJunio C Hamano2012-02-21
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/checkout-out-of-unborn' into maintJunio C Hamano2012-02-16
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jx/i18n-more-marking' into maintJunio C Hamano2012-02-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-tag-show-fixes' into maintJunio C Hamano2012-02-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/merge-no-edit-fix' into maintJunio C Hamano2012-02-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'zj/diff-stat-dyncol'Junio C Hamano2012-03-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | diff --stat: add config option to limit graph widthZbigniew Jędrzejewski-Szmek2012-03-01
| * | | | | | | | | | | | | | | | | merge --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-01
| * | | | | | | | | | | | | | | | | log --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-01
| * | | | | | | | | | | | | | | | | show --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-01
| * | | | | | | | | | | | | | | | | diff --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-01
* | | | | | | | | | | | | | | | | | Merge branch 'jk/symbolic-ref-short'Junio C Hamano2012-03-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | symbolic-ref --short: abbreviate the output unambiguouslyJan Krüger2012-02-27
* | | | | | | | | | | | | | | | | | | Merge branch 'cb/fsck-squelch-dangling'Junio C Hamano2012-03-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | fsck: --no-dangling omits "dangling object" informationJunio C Hamano2012-02-28
* | | | | | | | | | | | | | | | | | | | Merge branch 'rs/no-no-no-parseopt'Junio C Hamano2012-03-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | parse-options: remove PARSE_OPT_NEGHELPRené Scharfe2012-02-28
* | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/maint-verify-objects'Junio C Hamano2012-03-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | rev-list: fix --verify-objects --quiet becoming --objectsNguyễn Thái Ngọc Duy2012-02-28
| * | | | | | | | | | | | | | | | | | | | rev-list: remove BISECT_SHOW_TRIED flagNguyễn Thái Ngọc Duy2012-02-28
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'cn/maint-branch-with-bad'Junio C Hamano2012-03-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | branch: don't assume the merge filter ref existsCarlos Martín Nieto2012-02-27
* | | | | | | | | | | | | | | | | | | Merge branch 'fc/push-prune'Junio C Hamano2012-02-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | push: add '--prune' optionFelipe Contreras2012-02-22
* | | | | | | | | | | | | | | | | | | | pack-objects: Fix compilation with NO_PTHREDSMichał Kiedrowicz2012-02-26
| |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/config-include'Junio C Hamano2012-02-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | config: add include directiveJeff King2012-02-17
| * | | | | | | | | | | | | | | | | | | config: stop using config_exclusive_filenameJeff King2012-02-17
| * | | | | | | | | | | | | | | | | | | config: copy the return value of prefix_filenameJeff King2012-02-17
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'pj/remote-set-branches-usage-fix'Junio C Hamano2012-02-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | remote: fix set-branches usage and documentationPhilip Jägenstedt2012-02-19
* | | | | | | | | | | | | | | | | | | merge: do not trust fstat(2) too much when checking interactivenessJunio C Hamano2012-02-23
* | | | | | | | | | | | | | | | | | | Merge branch 'tg/tag-points-at'Junio C Hamano2012-02-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | builtin/tag.c: Fix a sparse warningRamsay Jones2012-02-13
| * | | | | | | | | | | | | | | | | | | tag: add --points-at list optionTom Grennan2012-02-08
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'zj/decimal-width'Junio C Hamano2012-02-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | make lineno_width() from blame reusable for othersZbigniew Jędrzejewski-Szmek2012-02-14
| | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |