summaryrefslogtreecommitdiff
path: root/t/t7608-merge-messages.sh
Commit message (Expand)AuthorAgeFilesLines
* t7[5-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-19/+19
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
* Revert "fmt-merge-msg: stop treating `master` specially"Junio C Hamano2020-07-301-5/+5
* fmt-merge-msg: stop treating `master` speciallyJohannes Schindelin2020-06-231-5/+5
* merge: notice local merging of tags and keep it unwrappedJunio C Hamano2011-11-071-2/+2
* Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy2010-11-031-2/+2
* merge: indicate remote tracking branches in merge messageJeff King2009-08-091-0/+10
* merge: fix incorrect merge message for ambiguous tag/branchJeff King2009-08-091-1/+1
* add tests for merge message headingsJeff King2009-08-091-0/+50