Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jn/cherry-pick-strategy-option' | Junio C Hamano | 2011-02-09 |
|\ | |||
| * | cherry-pick/revert: add support for -X/--strategy-option | Jonathan Nieder | 2010-12-28 |
* | | Merge branch 'rj/test-fixes' | Junio C Hamano | 2011-01-13 |
|\ \ | |||
| * | | t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW | Ramsay Jones | 2011-01-08 |
| * | | t3032-*.sh: Pass the -b (--binary) option to sed on cygwin | Ramsay Jones | 2011-01-08 |
| |/ | |||
* | | t3032: limit sed branch labels to 8 characters | Brandon Casey | 2011-01-06 |
|/ | |||
* | merge-recursive: options to ignore whitespace changes | Justin Frankel | 2010-08-27 |