All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Joshua Jensen <jjensen@workspacewhiz.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
	Stephen Bash <bash@genarts.com>
Subject: Re: Difference between 'git rebase' and 'git rebase -m'
Date: Tue, 16 Nov 2010 12:27:49 -0600	[thread overview]
Message-ID: <20101116182749.GC14552@burratino> (raw)
In-Reply-To: <4CE2C0ED.1030309@workspacewhiz.com>

Joshua Jensen wrote:

> I'm curious as to why 'git rebase -m' isn't the default and what the
> real difference is between 'git rebase' and 'git rebase -m'.

git rebase is faster. :)

git rebase works by formatting a patch series and applying it.
git rebase -m uses repeated 3-way merge and should be more robust.

  reply	other threads:[~2010-11-16 18:28 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-16 17:35 Difference between 'git rebase' and 'git rebase -m' Joshua Jensen
2010-11-16 18:27 ` Jonathan Nieder [this message]
2010-11-17 11:43   ` Nguyen Thai Ngoc Duy
2010-11-17 13:36     ` Michael J Gruber
2010-11-17 14:38       ` Nguyen Thai Ngoc Duy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20101116182749.GC14552@burratino \
    --to=jrnieder@gmail.com \
    --cc=bash@genarts.com \
    --cc=git@vger.kernel.org \
    --cc=jjensen@workspacewhiz.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.