Phil Hord <[email protected]> writes:
> Because I am in a git-rebase which has apparently failed, I would
> expect 'git rebase --abort' would save me here.
More generally, if I "git rebase --abort" in the middle of a rebase (not
necessarily at the end), I'd expect the stash to be restored. Right now,
if I read correctly, "git rebase --abort" would discard the stashed
changes without giving me the sha1 I'd need to use to recover it :-(.
Recovering the stash should be doable with stg like
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -341,6 +341,11 @@ abort)
;;
esac
output git reset --hard $orig_head
+ if test -f "$state_dir/autostash"
+ then
+ stash_sha1=$(cat "$state_dir/autostash")
+ git stash apply $stash_sha1
+ fi
rm -r "$state_dir"
exit
;;
the "stash apply" should succeed without conflict by construction
because the stash is applied on the commit it was created.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
