Re: [PATCH 3/3] pull: introduce --[no-]autostash and pull.autostash
- From
Ramkumar Ramachandra <artagnon@gmail.com>
- Date
- Apr 15, 2013, 17:05 UTC
- Message-ID
- <CALkWK0m5rnQPkJGd6mjmFP4BKCe+Cip2ifh94a9FHzYTiYtm8Q@mail.gmail.com>
- In-Reply-To
- <20130415165352.GH2278@serenity.lan>
John Keeping wrote:
> Why restrict it to non-interactive? I'd find it useful when doing > interactive rebases as well - consider the case when you simply want to > re-order some commits.
Actually, I made a mistake: it should be doable for any specific rebase (includes rebase--interactive, rebase--am, and rebase--merge) just as easily, without leaking the autostash detail into them. The last statement in git-rebase.sh is run_specific_rebase, which just needs to be wrapped in a git stash/ git stash pop.