aboutsummaryrefslogtreecommitdiffstats
path: root/t/t7608-merge-messages.sh
AgeCommit message (Expand)AuthorFilesLines
2011-11-07merge: notice local merging of tags and keep it unwrappedJunio C Hamano1-2/+2
2010-11-03Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy1-2/+2
2009-08-09merge: indicate remote tracking branches in merge messageJeff King1-0/+10
2009-08-09merge: fix incorrect merge message for ambiguous tag/branchJeff King1-1/+1
2009-08-09add tests for merge message headingsJeff King1-0/+50