aboutsummaryrefslogtreecommitdiffstats
path: root/t/t7608-merge-messages.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2023-10-03merge: free result of repo_get_merge_bases()Jeff King1-0/+1
2020-11-19t7[5-9]*: adjust the references to the default branch name "main"Johannes Schindelin1-19/+19
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2020-07-30Revert "fmt-merge-msg: stop treating `master` specially"Junio C Hamano1-5/+5
2020-06-23fmt-merge-msg: stop treating `master` speciallyJohannes Schindelin1-5/+5
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