Re: [PATCH 3/3] pull: introduce --[no-]autostash and pull.autostash

Matthieu Moy [off-list ref] writes:

Ramkumar Ramachandra [off-list ref] writes:

quoted

Yes, touching a simple "autostash" file at stash-time, and removing it
at pop-time will do.  I don't see why it should be part of a
(potentially user-editable) todo-list, which serves an entirely
different purpose.

You'll have to apply the index state and then the tree state. How do you
know whether the next call to "git rebase" should apply one or the other?

Plus: what happens if the user ran "git stash" during rebase? In Junio's
version, the right commits are applied. Running blindly "stash pop" may
pop the wrong stash.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/