From: Matthieu Moy Date: Fri, 25 Mar 2016 09:05:28 GMT Subject: Re: [PATCH v10 2/2] pull --rebase: add --[no-]autostash flag Message-ID: In-Reply-To: <1458591170-28079-1-git-send-email-mehul.jain2029@gmail.com> Mehul Jain writes: > +--autostash:: > +--no-autostash:: > + Before starting rebase, stash local modifications away (see > + linkgit:git-stash[1]) if needed, and apply the stash when > + done. `--no-autostash` is useful to override the `rebase.autoStash` > + configuration variable (see linkgit:git-config[1]). > ++ > +This option is only valid when "--rebase" is used. This does not have to be added to this series (I don't want to break everything at v10 ...), but I think it would be nice to allow "git pull --autostash" even without --rebase if pull.rebase=true. -- Matthieu Moy http://www-verimag.imag.fr/~moy/