Request for rebaseif extension to be provided by default with rebase

[Arne Babenhauserheide]

On Saturday 18 June 2011 09:07:47 Sébastien Deleuze wrote:
> However, if the current branch has not diverged from the other--so every
> commit present in the current branch is already contained in the other--then
> git just performs a "fast forward"; the head of the current branch is moved
> forward to point at the head of the merged-in branch, without any new
> commits being created.
> I don't know how to call this in Mercurial world ...

I don’t know either, but it is a behaviour I witness a lot when working on the 
Hurd wiki, and it is *very* convenient. 

Essentially it means: If I can’t push, just do git pull; git push, and when 
there are no conflicts, my changes are online. 

Actually I think that the equivalent would be to merge automatically but to 
bail out on errors und turn the *merge* into a pull. 

Fetch without user interaction. 

I don’t know if merging without touching the workdir is possible, though 
(that’s what would be needed, so it can be undone easily without disturbing 
uncommitted changes).

Best wishes, 
Arne
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 316 bytes
Desc: This is a digitally signed message part.
URL: <http://selenic.com/pipermail/mercurial/attachments/20110619/8415a168/attachment.pgp>