From 128c4a66ab3413b2135264f17024e1f5e9250f03 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 16 Jun 2017 15:40:46 +0200 Subject: [PATCH 4/4] fixup! sequencer: print autostash messages to stderr This is the companion to the proposed patch, but I had no time to verify that the test suite still passes (it may actually test for the buggy behavior...) Signed-off-by: Johannes Schindelin --- git-rebase.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index db1deed8464..2cf73b88e8e 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -166,14 +166,14 @@ apply_autostash () { stash_sha1=$(cat "$state_dir/autostash") if git stash apply $stash_sha1 2>&1 >/dev/null then - echo "$(gettext 'Applied autostash.')" + echo "$(gettext 'Applied autostash.')" >&2 else git stash store -m "autostash" -q $stash_sha1 || die "$(eval_gettext "Cannot store \$stash_sha1")" gettext 'Applying autostash resulted in conflicts. Your changes are safe in the stash. You can run "git stash pop" or "git stash drop" at any time. -' +' >&2 fi fi } -- 2.12.2.windows.1