From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 05 Aug 2007 03:32:34 GMT
Subject: Re: Some ideas for StGIT
Message-ID: <7vodhmirl9.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20070805023130.GV20052@spearce.org>

"Shawn O. Pearce" <spearce@spearce.org> writes:

> So really `revert`, `cherry-pick`, `rebase -m` (and also `am -3`
> as it also uses merge-recursive) are all the same underlying
> implementation.

Minor factual correction.  "am -3" uses merge-recursive *ONLY*
when patch does not apply, so it is often the best of both
worlds, as long as your changes do not involve renames.  And
that is what the default rebase uses.