Request for rebaseif extension to be provided by default with rebase
bboissin at gmail.com
Sat Jun 18 08:38:07 CDT 2011
On Sat, Jun 18, 2011 at 3:25 PM, Sébastien Deleuze <seb at deleuze.fr> wrote:
> In Mercurial, The fast forward merge could be done on "hg pull --ff" in case
> we have local commit not pushed to the local repo. It would just update the
> parent of the local commits to the freashly pulled one, avoiding an
> unecessary anonymous head when we just pull to update the local repo.
fast-forward is only meaningful for git or hg with bookmarks (it's a
"pointers/bookmarks" operation, not an operation on the history).
The case you describe would *not* be a fast-forward with git, if you
have divergent commits you cannot fast forward.
I really wish people would not say fast-forward merge (since it's not
a merge), but fast-forward update.
More information about the Mercurial