From: Phil Hord Date: Fri, 14 Jun 2013 11:59:16 GMT Subject: Re: [PATCH 1/2] pull: respect rebase.autostash Message-ID: In-Reply-To: On Fri, Jun 14, 2013 at 6:41 AM, Ramkumar Ramachandra wrote: > Matthieu Moy wrote: >> It would be nice to have an --autostash command-line option too, > > I thought it would be a bit ugly, since it's already overloaded with > options to pass to merge. Eventually I think a switch will be needed. At least there is git -c rebase.autostash=false But we will probably need to also have --no-autostash for scripts and users. Phil