summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2008-03-13add test_cmp function for test scriptsLibravatar Jeff King1-1/+1
2008-03-13remove use of "tail -n 1" and "tail -1"Libravatar Jeff King1-1/+1
2008-03-13grep portability fix: don't use "-e" or "-q"Libravatar Jeff King1-2/+2
2008-03-03git-merge.sh: better handling of combined --squash,--no-ff,--no-commit optionsLibravatar Gerrit Pape1-0/+6
2008-01-05t/t7600: avoid GNUism in grepLibravatar Junio C Hamano1-2/+2
2007-09-23git-merge: add --ff and --no-ff optionsLibravatar Lars Hjemli1-0/+20
2007-09-23git-merge: add support for --commit and --no-squashLibravatar Lars Hjemli1-0/+22
2007-09-23git-merge: add support for branch.<name>.mergeoptionsLibravatar Lars Hjemli1-0/+54
2007-09-23Add test-script for git-merge porcelainLibravatar Lars Hjemli1-0/+344