summaryrefslogtreecommitdiff
path: root/t/t7604-merge-custom-message.sh
Commit message (Expand)AuthorAgeFilesLines
* merge: notice local merging of tags and keep it unwrappedJunio C Hamano2011-11-071-1/+1
* merge: --log appends shortlog to message if specifiedTay Ray Chuan2010-05-101-1/+1
* t7604-merge-custom-message: show that --log doesn't append to -mTay Ray Chuan2010-05-101-0/+12
* t7604-merge-custom-message: shift expected output creationTay Ray Chuan2010-05-101-4/+8
* merge: do not add standard message when message is given with -m optionJunio C Hamano2009-12-021-5/+2
* tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-031-1/+1
* Add new test case to ensure git-merge prepends the custom merge messageMiklos Vajna2008-07-061-0/+37