From: Junio C Hamano <gitster@pobox.com>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: Jakub Narebski <jnareb@gmail.com>, git@vger.kernel.org
Subject: Re: Some ideas for StGIT
Date: Sat, 04 Aug 2007 20:32:34 -0700 [thread overview]
Message-ID: <7vodhmirl9.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20070805023130.GV20052@spearce.org> (Shawn O. Pearce's message of "Sat, 4 Aug 2007 22:31:30 -0400")
"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.
next prev parent reply other threads:[~2007-08-05 3:32 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-03 17:50 Some ideas for StGIT Pavel Roskin
2007-08-03 18:14 ` Andy Parkins
2007-08-04 5:41 ` Pavel Roskin
2007-08-04 5:51 ` Shawn O. Pearce
2007-08-05 0:08 ` Pavel Roskin
2007-08-05 0:17 ` Jakub Narebski
2007-08-05 2:31 ` Shawn O. Pearce
2007-08-05 3:32 ` Junio C Hamano [this message]
2007-08-05 13:39 ` Josef Sipek
2007-08-05 13:56 ` Johannes Schindelin
2007-08-05 14:06 ` Josef Sipek
2007-08-05 14:15 ` Johannes Schindelin
2007-08-05 14:57 ` Josef Sipek
2007-08-04 8:08 ` Yann Dirson
2007-08-06 10:01 ` Catalin Marinas
2007-08-04 14:14 ` Chris Shoemaker
2007-08-04 15:22 ` Johannes Schindelin
2007-08-03 23:23 ` Yann Dirson
2007-08-06 9:49 ` Catalin Marinas
2007-08-06 13:26 ` Pavel Roskin
2007-08-06 15:19 ` Josef Sipek
2007-08-04 6:38 ` Theodore Tso
2007-08-04 8:16 ` Yann Dirson
2007-08-04 21:35 ` Josef Sipek
2007-08-05 0:12 ` Pavel Roskin
2007-08-06 9:36 ` Catalin Marinas
2007-08-06 9:56 ` Karl Hasselström
2007-08-06 12:42 ` Pavel Roskin
2007-08-06 13:52 ` Karl Hasselström
2007-08-23 14:09 ` Catalin Marinas
2007-08-23 14:34 ` Karl Hasselström
2007-08-06 17:17 ` Pavel Roskin
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=7vodhmirl9.fsf@assigned-by-dhcp.cox.net \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=spearce@spearce.org \
/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.