summaryrefslogtreecommitdiff
path: root/t/t7608-merge-messages.sh
AgeCommit message (Expand)Author
2020-11-19t7[5-9]*: adjust the references to the default branch name "main"Johannes Schindelin
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2020-07-30Revert "fmt-merge-msg: stop treating `master` specially"Junio C Hamano
2020-06-24fmt-merge-msg: stop treating `master` speciallyJohannes Schindelin
2011-11-07merge: notice local merging of tags and keep it unwrappedJunio C Hamano
2010-11-03Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy
2009-08-09merge: indicate remote tracking branches in merge messageJeff King
2009-08-09merge: fix incorrect merge message for ambiguous tag/branchJeff King
2009-08-09add tests for merge message headingsJeff King