Re: [PATCH v2 2/2] pull: allow dirty tree when rebase.autostash enabled

2015-06-17 Thread Kevin Daudt
On Thu, Jun 11, 2015 at 09:34:08PM +0800, Paul Tan wrote: > On Sun, Jun 7, 2015 at 5:12 AM, Kevin Daudt wrote: > > From: Kevin Daudt > > > > Signed-off-by: Kevin Daudt > > Ehh? The sign-off does not match the author of the patch. I changed it, but aparently forgot to reset the author for that

Re: [PATCH v2 2/2] pull: allow dirty tree when rebase.autostash enabled

2015-06-11 Thread Paul Tan
On Sun, Jun 7, 2015 at 5:12 AM, Kevin Daudt wrote: > From: 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

[PATCH v2 2/2] pull: allow dirty tree when rebase.autostash enabled

2015-06-06 Thread Kevin Daudt
From: 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 --- git-pull.sh | 5 - t/t5520-pull.s