Re: [RFC/PATCH] rebase: use reflog to find common base with upstream

2013-12-09 Thread John Keeping
On Mon, Dec 09, 2013 at 12:11:50PM -0800, Junio C Hamano wrote: > John Keeping writes: > > > Last time this came up [1], there was some discussion about moving the > > added block of code to affect upstreams given on the command line as > > well as when the upstream is discovered from the config.

Re: [RFC/PATCH] rebase: use reflog to find common base with upstream

2013-12-09 Thread Junio C Hamano
John Keeping writes: > Last time this came up [1], there was some discussion about moving the > added block of code to affect upstreams given on the command line as > well as when the upstream is discovered from the config. Having tried > that, it has some more fallout on the test suite than I l

Re: [RFC/PATCH] rebase: use reflog to find common base with upstream

2013-12-08 Thread Martin von Zweigbergk
On Sun, Dec 8, 2013 at 12:06 PM, John Keeping wrote: > Commit 15a147e (rebase: use @{upstream} if no upstream specified, > 2011-02-09) says: > > Make it default to 'git rebase @{upstream}'. That is also what > 'git pull [--rebase]' defaults to, so it only makes sense that >

[RFC/PATCH] rebase: use reflog to find common base with upstream

2013-12-08 Thread John Keeping
Commit 15a147e (rebase: use @{upstream} if no upstream specified, 2011-02-09) says: Make it default to 'git rebase @{upstream}'. That is also what 'git pull [--rebase]' defaults to, so it only makes sense that 'git rebase' defaults to the same thing. but that isn't actuall