> On Mar 9, 2017, at 14:18, Brandon Allbery <allber...@gmail.com> wrote:
>
>
> On Thu, Mar 9, 2017 at 2:51 PM, Ryan Schmidt <ryandes...@macports.org> wrote:
> Why won't it automatically stash? Usually it does, but apparently not when
> there are conflicts.
>
> The manpage for git pull warns that --autostash has edge cases/restrictions.
I only see:
--autostash, --no-autostash
Before starting rebase, stash local modifications away (see git-stash(1))
if
needed, and apply the stash when done. --no-autostash is useful to
override
the rebase.autoStash configuration variable (see git-config(1)).
This option is only valid when "--rebase" is used.
