merge: indicate remote tracking branches in merge message
authorJeff King <peff@peff.net>
Sun, 9 Aug 2009 10:02:51 +0000 (06:02 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Aug 2009 19:34:21 +0000 (12:34 -0700)
commit69a8b7c...4192dfa7bde3937d2c84324a2cd1506b
tree708d612...2040df83649eb7095a88a201cac31af3copy hash to clipboard (tree)
parent751c597...6c7522982214528eb653dfb61d372257copy hash to clipboard (diff)
builtin-merge.c
t/t3409-rebase-preserve-merges.sh
t/t7608-merge-messages.sh