rebase: Support preserving merges in non-interactive mode

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index a6a5c52b59b893d6f69fce483c82c762a089003d..da768ee7acc22e6480f0a067e109239561d43927 100755 (executable)
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -54,7 +54,7 @@ sub colored {
 my $patch_mode;
 
 sub run_cmd_pipe {
-       if ($^O eq 'MSWin32') {
+       if ($^O eq 'MSWin32' || $^O eq 'msys') {
                my @invalid = grep {m/[":*]/} @_;
                die "$^O does not support: @invalid\n" if @invalid;
                my @args = map { m/ /o ? "\"$_\"": $_ } @_;