aboutsummaryrefslogtreecommitdiffstats
path: root/builtin-fmt-merge-msg.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-24 15:29:55 -0700
committerJunio C Hamano <gitster@pobox.com>2009-05-24 15:29:55 -0700
commit9619ff14159ab3401636b9883a715b0f20b051df (patch)
tree6c6a310adf1f2138eca3f42bd484ac41ea7c50fe /builtin-fmt-merge-msg.c
parentt/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to C (diff)
parentMerge branch 'maint-1.6.2' into maint (diff)
downloadgit-9619ff14159ab3401636b9883a715b0f20b051df.tar.gz
git-9619ff14159ab3401636b9883a715b0f20b051df.zip
Merge branch 'maint'
* maint: http-push.c::remove_locks(): fix use after free
Diffstat (limited to 'builtin-fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions