summaryrefslogtreecommitdiff
path: root/t/t7608-merge-messages.sh
AgeCommit message (Expand)AuthorFilesLines
2020-11-19t7[5-9]*: adjust the references to the default branch name "main"Libravatar Johannes Schindelin1-19/+19
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Libravatar Johannes Schindelin1-0/+3
2020-07-30Revert "fmt-merge-msg: stop treating `master` specially"Libravatar Junio C Hamano1-5/+5
2020-06-23fmt-merge-msg: stop treating `master` speciallyLibravatar Johannes Schindelin1-5/+5
2011-11-07merge: notice local merging of tags and keep it unwrappedLibravatar Junio C Hamano1-2/+2
2010-11-03Change incorrect "remote branch" to "remote tracking branch" in C codeLibravatar Matthieu Moy1-2/+2
2009-08-09merge: indicate remote tracking branches in merge messageLibravatar Jeff King1-0/+10
2009-08-09merge: fix incorrect merge message for ambiguous tag/branchLibravatar Jeff King1-1/+1
2009-08-09add tests for merge message headingsLibravatar Jeff King1-0/+50