Request for rebaseif extension to be provided by default with rebase

[Kevin Bullock]

On Jun 18, 2011, at 9:13 AM, Sébastien Deleuze wrote:

> Thanks for this feedback, I think I understand my mistake now and the misconceptions there is on this subject.
> 
> That woudl mean that the only way to acheive the "pull + push with a linear history when I have local commits" is only possible in Mercurial with a "safe rebase". Sad news for me !

The only way to achieve what you want -in any DVCS-, Git included, is to use rebase.

If you have local commits that aren't already present in the repo you're pulling from, -and- there's other commits in that repo not present in yours, then you don't have linear history. Git will not fast-forward merge in this case, for the same reason that Mercurial bails on the update portion of `pull -u` in this case.

If history diverges, the only way to make it linear again is to rebase. And that's not a workflow to be recommended for regular use.

pacem in terris / mir / shanti / salaam / heiwa
Kevin R. Bullock