Hi Junio,
Thanks for the thorough review.
On Sat, Mar 5, 2016 at 10:34 PM, Junio C Hamano wrote:
> Is it worth checking the case where autostash kicks in, rebase
> itself is completed successfully, but the final "stash pop" fails in
> conflict? I am thinking aloud and just wondering, not sugges
Mehul Jain writes:
> +--autostash::
> +--no-autostash::
> + Before starting rebase, stash local modifications away (see
> + linkgit:git-stash.txt[1]) if needed, and apply the stash when
> + done.
> ++
> +This option is only valid when '--rebase' is used.
> ++
> +'--no-autostash' is us
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
>
If rebase.autoStash configuration variable is set, there is no way to
override it for "git pull --rebase" from the command line.
Teach "git pull --rebase" the --[no-]autostash command line flag which
overrides the current value of rebase.autoStash, if set. As "git rebase"
understands the --[no-]au
4 matches
Mail list logo
