summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/push-upstream-sanity' into maintJunio C Hamano2012-04-261-8/+18
|\
| * push: error out when the "upstream" semantics does not make senseJunio C Hamano2012-04-051-8/+18
* | Merge branch 'jk/diff-no-rename-empty' into maintJunio C Hamano2012-04-261-1/+1
|\ \
| * | drop casts from users EMPTY_TREE_SHA1_BINJeff King2012-03-231-1/+1
* | | Merge branch 'jc/commit-unedited-template' into maintJunio C Hamano2012-04-261-19/+43
|\ \ \
| * | | commit: rephrase the error when user did not touch templated log messageJunio C Hamano2012-03-301-19/+41
| * | | commit: do not trigger bogus "has templated message edited" checkJunio C Hamano2012-03-301-0/+2
* | | | Merge branch 'jc/commit-hook-authorship' into maintJunio C Hamano2012-04-261-3/+19
|\ \ \ \
| * | | | commit: pass author/committer info to hooksjc/commit-hook-authorshipJunio C Hamano2012-03-111-3/+19
* | | | | Sync with 1.7.9.6Junio C Hamano2012-04-021-4/+1
|\ \ \ \ \
| * \ \ \ \ 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
| | |\ \ \ \
* | | | | | | config: remove useless assignmentRené Scharfe2012-03-281-2/+0
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'az/verify-tag-use-gpg-config'Junio C Hamano2012-03-121-1/+9
|\ \ \ \ \ \
| * | | | | | verify-tag: Parse GPG configuration options.az/verify-tag-use-gpg-configAlex Zepeda2012-03-081-1/+9
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'kb/maint-prune-rmdir-closedir'Junio C Hamano2012-03-082-3/+3
|\ \ \ \ \ \
| * | | | | | fix deletion of .git/objects sub-directories in git-prune/repackkb/maint-prune-rmdir-closedirKarsten Blees2012-03-072-3/+3
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'cn/maint-branch-with-bad' into maintJunio C Hamano2012-03-041-0/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'nd/maint-verify-objects' into maintJunio C Hamano2012-03-041-22/+16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'pj/remote-set-branches-usage-fix' into maintJunio C Hamano2012-02-271-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'tr/merge-edit-guidance' into maintJunio C Hamano2012-02-271-0/+10
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'cb/receive-pack-keep-errors' into maintJunio C Hamano2012-02-211-7/+17
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'cb/transfer-no-progress' into maintJunio C Hamano2012-02-215-16/+18
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/git-dir-lookup' into maintJunio C Hamano2012-02-211-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-rev-list-verify-object' into maintJunio C Hamano2012-02-211-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/grep-binary-attribute' into maintJunio C Hamano2012-02-211-144/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/diffstat-gramnum' into maintJunio C Hamano2012-02-211-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/checkout-out-of-unborn' into maintJunio C Hamano2012-02-161-0/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jx/i18n-more-marking' into maintJunio C Hamano2012-02-161-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-tag-show-fixes' into maintJunio C Hamano2012-02-131-32/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/merge-no-edit-fix' into maintJunio C Hamano2012-02-131-3/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'zj/diff-stat-dyncol'Junio C Hamano2012-03-063-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | diff --stat: add config option to limit graph widthzj/diff-stat-dyncolZbigniew Jędrzejewski-Szmek2012-03-013-1/+4
| * | | | | | | | | | | | | | | | | | | | merge --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-011-0/+1
| * | | | | | | | | | | | | | | | | | | | log --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-011-0/+1
| * | | | | | | | | | | | | | | | | | | | show --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-011-0/+2
| * | | | | | | | | | | | | | | | | | | | diff --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-011-0/+3
* | | | | | | | | | | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | |
View Lorry Controller Status