summaryrefslogtreecommitdiff
path: root/builtin-fmt-merge-msg.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-04-05 01:04:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-05 01:04:54 -0700
commitbe18f4b899a94ff51ff3c621822500579cf6df6a (patch)
tree4c51b65cbee630580fe470b4ed5ba695ce3187f0 /builtin-fmt-merge-msg.c
parentdoc/git-pack-refs: fix two grammar issues (diff)
parentMerge branch 'maint-1.6.0' into maint-1.6.1 (diff)
downloadtgif-be18f4b899a94ff51ff3c621822500579cf6df6a.tar.xz
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1: commit: abort commit if interactive add failed git-repack: use non-dashed update-server-info
Diffstat (limited to 'builtin-fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions