Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sync with 1.7.9.6 | Junio C Hamano | 2012-04-02 | 1 | -4/+1 |
|\ | |||||
| * | Merge branch 'jc/maint-merge-autoedit' into maint | Junio C Hamano | 2012-04-02 | 1 | -1/+28 |
| |\ | |||||
| | * | merge: backport GIT_MERGE_AUTOEDIT supportjc/maint-merge-autoedit | Junio C Hamano | 2012-03-20 | 1 | -1/+28 |
| * | | Merge branch 'maint-1.7.8' into maint | Junio C Hamano | 2012-03-20 | 1 | -5/+4 |
| |\ \ | | |/ | |/| | |||||
| | * | Merge branch 'jc/advise-i18n' into maint-1.7.8 | Junio C Hamano | 2012-03-20 | 1 | -5/+4 |
| | |\ | |||||
* | | | | config: remove useless assignment | René Scharfe | 2012-03-28 | 1 | -2/+0 |
* | | | | Merge branch 'az/verify-tag-use-gpg-config' | Junio C Hamano | 2012-03-12 | 1 | -1/+9 |
|\ \ \ \ | |||||
| * | | | | verify-tag: Parse GPG configuration options.az/verify-tag-use-gpg-config | Alex Zepeda | 2012-03-08 | 1 | -1/+9 |
* | | | | | Merge branch 'kb/maint-prune-rmdir-closedir' | Junio C Hamano | 2012-03-08 | 2 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | fix deletion of .git/objects sub-directories in git-prune/repackkb/maint-prune-rmdir-closedir | Karsten Blees | 2012-03-07 | 2 | -3/+3 |
| | |/ / / | |/| | | | |||||
| * | | | | Merge branch 'cn/maint-branch-with-bad' into maint | Junio C Hamano | 2012-03-04 | 1 | -0/+4 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'nd/maint-verify-objects' into maint | Junio C Hamano | 2012-03-04 | 1 | -22/+16 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'pj/remote-set-branches-usage-fix' into maint | Junio C Hamano | 2012-02-27 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'tr/merge-edit-guidance' into maint | Junio C Hamano | 2012-02-27 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'cb/receive-pack-keep-errors' into maint | Junio C Hamano | 2012-02-21 | 1 | -7/+17 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'cb/transfer-no-progress' into maint | Junio C Hamano | 2012-02-21 | 5 | -16/+18 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/git-dir-lookup' into maint | Junio C Hamano | 2012-02-21 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/maint-rev-list-verify-object' into maint | Junio C Hamano | 2012-02-21 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/grep-binary-attribute' into maint | Junio C Hamano | 2012-02-21 | 1 | -144/+33 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/diffstat-gramnum' into maint | Junio C Hamano | 2012-02-21 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/checkout-out-of-unborn' into maint | Junio C Hamano | 2012-02-16 | 1 | -0/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jx/i18n-more-marking' into maint | Junio C Hamano | 2012-02-16 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-tag-show-fixes' into maint | Junio C Hamano | 2012-02-13 | 1 | -32/+40 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/merge-no-edit-fix' into maint | Junio C Hamano | 2012-02-13 | 1 | -3/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'zj/diff-stat-dyncol' | Junio C Hamano | 2012-03-06 | 3 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | diff --stat: add config option to limit graph widthzj/diff-stat-dyncol | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 3 | -1/+4 |
| * | | | | | | | | | | | | | | | | | | | merge --stat: use the full terminal width | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | | | | log --stat: use the full terminal width | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | | | | show --stat: use the full terminal width | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -0/+2 |
| * | | | | | | | | | | | | | | | | | | | diff --stat: use the full terminal width | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -0/+3 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/symbolic-ref-short' | Junio C Hamano | 2012-03-04 | 1 | -3/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | symbolic-ref --short: abbreviate the output unambiguouslyjk/symbolic-ref-short | Jan Krüger | 2012-02-27 | 1 | -3/+8 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/fsck-squelch-dangling' | Junio C Hamano | 2012-03-01 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | fsck: --no-dangling omits "dangling object" informationcb/fsck-squelch-dangling | Junio C Hamano | 2012-02-28 | 1 | -2/+5 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/no-no-no-parseopt' | Junio C Hamano | 2012-03-01 | 2 | -6/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | parse-options: remove PARSE_OPT_NEGHELPrs/no-no-no-parseopt | René Scharfe | 2012-02-28 | 2 | -5/+3 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/maint-verify-objects' | Junio C Hamano | 2012-03-01 | 1 | -22/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | rev-list: fix --verify-objects --quiet becoming --objectsnd/maint-verify-objects | Nguyễn Thái Ngọc Duy | 2012-02-28 | 1 | -11/+15 |
| * | | | | | | | | | | | | | | | | | | | | | | rev-list: remove BISECT_SHOW_TRIED flag | Nguyễn Thái Ngọc Duy | 2012-02-28 | 1 | -11/+1 |
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cn/maint-branch-with-bad' | Junio C Hamano | 2012-03-01 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | branch: don't assume the merge filter ref existscn/maint-branch-with-bad | Carlos Martín Nieto | 2012-02-27 | 1 | -0/+4 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'fc/push-prune' | Junio C Hamano | 2012-02-26 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | push: add '--prune' optionfc/push-prune | Felipe Contreras | 2012-02-22 | 1 | -0/+2 |
* | | | | | | | | | | | | | | | | | | | | | pack-objects: Fix compilation with NO_PTHREDS | Michał Kiedrowicz | 2012-02-26 | 1 | -1/+1 |
| |_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/config-include' | Junio C Hamano | 2012-02-23 | 1 | -33/+63 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | config: add include directive | Jeff King | 2012-02-17 | 1 | -10/+28 |
| * | | | | | | | | | | | | | | | | | | | | config: stop using config_exclusive_filename | Jeff King | 2012-02-17 | 1 | -24/+35 |
| * | | | | | | | | | | | | | | | | | | | | config: copy the return value of prefix_filename | Jeff King | 2012-02-17 | 1 | -3/+4 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'pj/remote-set-branches-usage-fix' | Junio C Hamano | 2012-02-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | remote: fix set-branches usage and documentationpj/remote-set-branches-usage-fix | Philip Jägenstedt | 2012-02-19 | 1 | -1/+1 |