summaryrefslogtreecommitdiff
path: root/t/t3032-merge-recursive-options.sh
AgeCommit message (Expand)Author
2011-02-10Merge branch 'jn/cherry-pick-strategy-option'Junio C Hamano
2011-01-13Merge branch 'rj/test-fixes'Junio C Hamano
2011-01-09t3032-*.sh: Do not strip CR from line-endings while grepping on MinGWRamsay Jones
2011-01-09t3032-*.sh: Pass the -b (--binary) option to sed on cygwinRamsay Jones
2011-01-06t3032: limit sed branch labels to 8 charactersBrandon Casey
2010-12-28cherry-pick/revert: add support for -X/--strategy-optionJonathan Nieder
2010-08-27merge-recursive: options to ignore whitespace changesJustin Frankel