aboutsummaryrefslogtreecommitdiffstats
path: root/t/t7604-merge-custom-message.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2021-10-07merge: add missing strbuf_release()Ævar Arnfjörð Bjarmason1-0/+1
2019-04-18merge: cleanup messages like commitDenton Liu1-0/+63
2019-04-18t7604: clean up styleDenton Liu1-5/+7
2011-11-07merge: notice local merging of tags and keep it unwrappedJunio C Hamano1-1/+1
2010-05-10merge: --log appends shortlog to message if specifiedTay Ray Chuan1-1/+1
2010-05-10t7604-merge-custom-message: show that --log doesn't append to -mTay Ray Chuan1-0/+12
2010-05-10t7604-merge-custom-message: shift expected output creationTay Ray Chuan1-4/+8
2009-12-02merge: do not add standard message when message is given with -m optionJunio C Hamano1-5/+2
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi1-1/+1
2008-07-06Add new test case to ensure git-merge prepends the custom merge messageMiklos Vajna1-0/+37