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

2015-07-22 Thread Junio C Hamano
Kevin Daudt m...@ikke.info writes: On Tue, Jul 07, 2015 at 11:59:56AM +0800, Paul Tan wrote: Any news about this? Is it still waiting for something? Paul's patch was buried in the noise and I didn't notice it. I'd prefer to see a new feature like this, that did not exist in the original, be

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

2015-07-22 Thread Kevin Daudt
On Tue, Jul 07, 2015 at 11:59:56AM +0800, Paul Tan wrote: On Mon, Jul 06, 2015 at 01:39:47PM -0700, Junio C Hamano wrote: Kevin Daudt m...@ikke.info writes: rebase learned to stash changes when it encounters a dirty work tree, but git pull --rebase does not. Only verify if the

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

2015-07-22 Thread Kevin Daudt
On Wed, Jul 22, 2015 at 12:42:17PM -0700, Junio C Hamano wrote: Kevin Daudt m...@ikke.info writes: On Tue, Jul 07, 2015 at 11:59:56AM +0800, Paul Tan wrote: Any news about this? Is it still waiting for something? Paul's patch was buried in the noise and I didn't notice it. I'd

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

2015-07-06 Thread Paul Tan
On Mon, Jul 06, 2015 at 01:39:47PM -0700, Junio C Hamano wrote: Kevin Daudt m...@ikke.info 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.