From: Ramkumar Ramachandra Date: Tue, 16 Apr 2013 09:55:30 GMT Subject: Re: [PATCH 3/3] pull: introduce --[no-]autostash and pull.autostash Message-ID: In-Reply-To: Matthieu Moy wrote: > And you're going to pop the stash even if no stash were triggered when > starting the rebase. > > Really, think about it again: you're not going to guess whether you have > to unstash without storing this information somewhere. You may argue > about storing it outside the todolist, you can't unstash > unconditionally. 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.