Re: [PATCH] fixup! rebase: implement --[no-]autostash and rebase.autostash
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:57:29
Ramkumar Ramachandra [off-list ref] writes:
For rr/rebase-autostash, which is stalled in pu. See $gmane/225689. This is a super-minor fix anyway: if you disagree with something, change it; there's no need to ask me.
As I wasn't the one who were disagreeing, that would not work well. Was there anybody "disagreeing" in the first place? I thought everybody was helping the series to get better.
quoted hunk
git-rebase.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)diff --git a/git-rebase.sh b/git-rebase.sh index 709ef6b..5906757 100755 --- a/git-rebase.sh +++ b/git-rebase.sh@@ -151,16 +151,16 @@ finish_rebase () { stash_sha1=$(cat "$state_dir/autostash") if git stash apply $stash_sha1 2>&1 >/dev/null then - echo "Applied autostash" + echo "$(gettext 'Applied autostash.')" else ref_stash=refs/stash && : >>"$GIT_DIR/logs/$ref_stash" && git update-ref -m "autostash" $ref_stash $stash_sha1 \ || die "$(eval_gettext 'Cannot store $stash_sha1')" - echo " -$(gettext 'Applying autostash resulted in conflicts. + gettext 'Applying autostash resulted in conflicts. Your changes are safe in the stash. -You can apply or drop it at any time.')" +You can run "git stash pop" or "git stash drop" it at any time. +' fi fi git gc --auto &&