rebase --preserve-merges: ignore "merge.log" config
authorRalf Thielow <ralf.thielow@gmail.com>
Wed, 21 Aug 2013 18:48:57 +0000 (20:48 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Aug 2013 22:44:15 +0000 (15:44 -0700)
commita9f739c...11898ed879bc077fb3a2f71b9766bba7
tree091ee67...536fba965c690fd93004738a31caa94ccopy hash to clipboard (tree)
parent4d06473...28ee574910accbde05c19ef2263abdf6copy hash to clipboard (diff)
git-rebase--interactive.sh
t/t3409-rebase-preserve-merges.sh