summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2012-04-26Merge branch 'jc/push-upstream-sanity' into maintLibravatar Junio C Hamano1-8/+18
2012-04-26Merge branch 'jk/diff-no-rename-empty' into maintLibravatar Junio C Hamano1-1/+1
2012-04-26Merge branch 'jc/commit-unedited-template' into maintLibravatar Junio C Hamano1-19/+43
2012-04-26Merge branch 'jc/commit-hook-authorship' into maintLibravatar Junio C Hamano1-3/+19
2012-04-05push: error out when the "upstream" semantics does not make senseLibravatar Junio C Hamano1-8/+18
2012-04-02Sync with 1.7.9.6Libravatar Junio C Hamano1-4/+1
2012-04-02Merge branch 'jc/maint-merge-autoedit' into maintLibravatar Junio C Hamano1-1/+28
2012-03-30commit: rephrase the error when user did not touch templated log messageLibravatar Junio C Hamano1-19/+41
2012-03-30commit: do not trigger bogus "has templated message edited" checkLibravatar Junio C Hamano1-0/+2
2012-03-28config: remove useless assignmentLibravatar René Scharfe1-2/+0
2012-03-23drop casts from users EMPTY_TREE_SHA1_BINLibravatar Jeff King1-1/+1
2012-03-20Merge branch 'maint-1.7.8' into maintLibravatar Junio C Hamano1-5/+4
2012-03-20merge: backport GIT_MERGE_AUTOEDIT supportLibravatar Junio C Hamano1-1/+28
2012-03-20Merge branch 'jc/advise-i18n' into maint-1.7.8Libravatar Junio C Hamano1-5/+4
2012-03-12Merge branch 'az/verify-tag-use-gpg-config'Libravatar Junio C Hamano1-1/+9
2012-03-11commit: pass author/committer info to hooksLibravatar Junio C Hamano1-3/+19
2012-03-08verify-tag: Parse GPG configuration options.Libravatar Alex Zepeda1-1/+9
2012-03-08Merge branch 'kb/maint-prune-rmdir-closedir'Libravatar Junio C Hamano2-3/+3
2012-03-07fix deletion of .git/objects sub-directories in git-prune/repackLibravatar Karsten Blees2-3/+3
2012-03-06Merge branch 'zj/diff-stat-dyncol'Libravatar Junio C Hamano3-0/+10
2012-03-04Merge branch 'jk/symbolic-ref-short'Libravatar Junio C Hamano1-3/+8
2012-03-04Merge branch 'cn/maint-branch-with-bad' into maintLibravatar Junio C Hamano1-0/+4
2012-03-04Merge branch 'nd/maint-verify-objects' into maintLibravatar Junio C Hamano1-22/+16
2012-03-01Merge branch 'cb/fsck-squelch-dangling'Libravatar Junio C Hamano1-2/+5
2012-03-01Merge branch 'rs/no-no-no-parseopt'Libravatar Junio C Hamano2-6/+3
2012-03-01Merge branch 'nd/maint-verify-objects'Libravatar Junio C Hamano1-22/+16
2012-03-01Merge branch 'cn/maint-branch-with-bad'Libravatar Junio C Hamano1-0/+4
2012-03-01diff --stat: add config option to limit graph widthLibravatar Zbigniew Jędrzejewski-Szmek3-1/+4
2012-03-01merge --stat: use the full terminal widthLibravatar Zbigniew Jędrzejewski-Szmek1-0/+1
2012-03-01log --stat: use the full terminal widthLibravatar Zbigniew Jędrzejewski-Szmek1-0/+1
2012-03-01show --stat: use the full terminal widthLibravatar Zbigniew Jędrzejewski-Szmek1-0/+2
2012-03-01diff --stat: use the full terminal widthLibravatar Zbigniew Jędrzejewski-Szmek1-0/+3
2012-02-28fsck: --no-dangling omits "dangling object" informationLibravatar Junio C Hamano1-2/+5
2012-02-28parse-options: remove PARSE_OPT_NEGHELPLibravatar René Scharfe2-5/+3
2012-02-28rev-list: fix --verify-objects --quiet becoming --objectsLibravatar Nguyễn Thái Ngọc Duy1-11/+15
2012-02-28rev-list: remove BISECT_SHOW_TRIED flagLibravatar Nguyễn Thái Ngọc Duy1-11/+1
2012-02-27symbolic-ref --short: abbreviate the output unambiguouslyLibravatar Jan Krüger1-3/+8
2012-02-27Merge branch 'pj/remote-set-branches-usage-fix' into maintLibravatar Junio C Hamano1-1/+1
2012-02-27Merge branch 'tr/merge-edit-guidance' into maintLibravatar Junio C Hamano1-0/+10
2012-02-27branch: don't assume the merge filter ref existsLibravatar Carlos Martín Nieto1-0/+4
2012-02-26Merge branch 'fc/push-prune'Libravatar Junio C Hamano1-0/+2
2012-02-26pack-objects: Fix compilation with NO_PTHREDSLibravatar Michał Kiedrowicz1-1/+1
2012-02-23Merge branch 'jk/config-include'Libravatar Junio C Hamano1-33/+63
2012-02-23Merge branch 'pj/remote-set-branches-usage-fix'Libravatar Junio C Hamano1-1/+1
2012-02-23merge: do not trust fstat(2) too much when checking interactivenessLibravatar Junio C Hamano1-1/+1
2012-02-22push: add '--prune' optionLibravatar Felipe Contreras1-0/+2
2012-02-21Merge branch 'cb/receive-pack-keep-errors' into maintLibravatar Junio C Hamano1-7/+17
2012-02-21Merge branch 'cb/transfer-no-progress' into maintLibravatar Junio C Hamano5-16/+18
2012-02-21Merge branch 'jk/git-dir-lookup' into maintLibravatar Junio C Hamano1-2/+2
2012-02-21Merge branch 'cb/maint-rev-list-verify-object' into maintLibravatar Junio C Hamano1-2/+2