summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
AgeCommit message (Expand)Author
2008-03-13remove use of "tail -n 1" and "tail -1"Jeff King
2008-03-13grep portability fix: don't use "-e" or "-q"Jeff King
2008-03-03git-merge.sh: better handling of combined --squash,--no-ff,--no-commit optionsGerrit Pape
2008-01-05t/t7600: avoid GNUism in grepJunio C Hamano
2007-09-24git-merge: add --ff and --no-ff optionsLars Hjemli
2007-09-24git-merge: add support for --commit and --no-squashLars Hjemli
2007-09-24git-merge: add support for branch.<name>.mergeoptionsLars Hjemli
2007-09-24Add test-script for git-merge porcelainLars Hjemli