Request for rebaseif extension to be provided by default with rebase

Matt Mackall mpm at
Fri Jun 17 17:29:11 CDT 2011

On Fri, 2011-06-17 at 17:08 -0500, Kevin Bullock wrote:
> On 17 Jun 2011, at 9:59 AM, Sébastien Deleuze wrote:
> > Both Git and Mercurial allow to do disinct operation, it is just about naming :
> >  - hg pull = git fetch
> >  - hg pull --rebaseif = git pull (fast forward activated by default)
> No, `git pull` = `hg pull -u` (except that git pull will also change where the branch ref points). A `git pull` will never rebase AFAIK.

To get any sort of rebasing on pull with git, you need to do:

git pull --rebase

..which comes with the following sternly-worded caveat:

               This is a potentially dangerous mode of operation. It rewrites
               history, which does not bode well when you published that
               history already. Do not use this option unless you have read
               git-rebase(1) carefully.

And there's no sign of a rebase-if equivalent.

If you went to the git folks and said "we would like to use rebasing as
a default in our workflow", Linus himself would probably disabuse you of
that notion in some way that I'm too polite for. You can find dozens of
instances of him publically clue-batting various senior kernel
developers for being foolish enough to automatically rebase.

"But git does it!" simply ain't gonna fly.

Mathematics is the supreme nostalgia of our time.

More information about the Mercurial mailing list