summaryrefslogtreecommitdiff
path: root/t/t7604-merge-custom-message.sh
AgeCommit message (Expand)Author
2011-11-07merge: notice local merging of tags and keep it unwrappedJunio C Hamano
2010-05-10merge: --log appends shortlog to message if specifiedTay Ray Chuan
2010-05-10t7604-merge-custom-message: show that --log doesn't append to -mTay Ray Chuan
2010-05-10t7604-merge-custom-message: shift expected output creationTay Ray Chuan
2009-12-02merge: do not add standard message when message is given with -m optionJunio C Hamano
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi
2008-07-07Add new test case to ensure git-merge prepends the custom merge messageMiklos Vajna