From: Mehul Jain Date: Sat, 05 Mar 2016 12:26:13 GMT Subject: Re: [PATCH v4] pull --rebase: add --[no-]autostash flag Message-ID: In-Reply-To: <1457171545-14496-1-git-send-email-mehul.jain2029@gmail.com> On Sat, Mar 5, 2016 at 3:22 PM, Mehul Jain wrote: > Changes: > * --no-autostash is passed to git-rebase (suggested by Paul) > > * Error message changed when "git pull --[no-]autostash" is called. > > * If rebase.autoStash is unset and user don't pass --[no-]autostash > flag then nothing is passed to git-rebase (i.e. if rebase.autoStash = -1), > as it should be left to git-rebase to decide what to do. I'm sorry. Here instead of " ... (i.e. if rebase.autoStash = -1), ... " it should be " ... (i.e. if opt_autostash = -1), ... " . Thanks, Mehul