Re: [PATCH v3] pull: allow dirty tree when rebase.autostash enabled

2015-06-17 Thread Junio C Hamano
Kevin Daudt writes: > rebase learned to stash changes when it encounters a dirty work tree, but > git pull --rebase does not. > > Only verify if the working tree is dirty when rebase.autostash is not > enabled. > > Signed-off-by: Kevin Daudt > Helped-by: Paul Tan > --- > Changes to v2: > - Dro

[PATCH v3] pull: allow dirty tree when rebase.autostash enabled

2015-06-17 Thread Kevin Daudt
rebase learned to stash changes when it encounters a dirty work tree, but git pull --rebase does not. Only verify if the working tree is dirty when rebase.autostash is not enabled. Signed-off-by: Kevin Daudt Helped-by: Paul Tan --- Changes to v2: - Dropped the change of the existing --rebase t