summaryrefslogtreecommitdiff
path: root/t/t7604-merge-custom-message.sh
AgeCommit message (Expand)AuthorFilesLines
2019-04-18merge: cleanup messages like commitLibravatar Denton Liu1-0/+63
2019-04-18t7604: clean up styleLibravatar Denton Liu1-5/+7
2011-11-07merge: notice local merging of tags and keep it unwrappedLibravatar Junio C Hamano1-1/+1
2010-05-10merge: --log appends shortlog to message if specifiedLibravatar Tay Ray Chuan1-1/+1
2010-05-10t7604-merge-custom-message: show that --log doesn't append to -mLibravatar Tay Ray Chuan1-0/+12
2010-05-10t7604-merge-custom-message: shift expected output creationLibravatar Tay Ray Chuan1-4/+8
2009-12-02merge: do not add standard message when message is given with -m optionLibravatar Junio C Hamano1-5/+2
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Libravatar Nanako Shiraishi1-1/+1
2008-07-06Add new test case to ensure git-merge prepends the custom merge messageLibravatar Miklos Vajna1-0/+37