summaryrefslogtreecommitdiffstats
path: root/t/t7600-merge.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* git-merge: add --ff and --no-ff optionsLars Hjemli2007-09-241-0/+20
* git-merge: add support for --commit and --no-squashLars Hjemli2007-09-241-0/+22
* git-merge: add support for branch.<name>.mergeoptionsLars Hjemli2007-09-241-0/+54
* Add test-script for git-merge porcelainLars Hjemli2007-09-241-0/+344