From: Thomas Rast <trast@student.ethz.ch>
To: Jeff King <peff@peff.net>
Cc: John Wiegley <johnw@boostpro.com>, <git@vger.kernel.org>
Subject: Re: Using Origin hashes to improve rebase behavior
Date: Sat, 12 Feb 2011 15:36:25 +0100 [thread overview]
Message-ID: <201102121536.25789.trast@student.ethz.ch> (raw)
In-Reply-To: <20110210225428.GA21335@sigill.intra.peff.net>
[I skipped most of the thread, so here's just one minor point.]
Jeff King wrote:
> I hadn't thought about merge --squash as a commit copying operation, but
> I think it is. I wonder if squash merges (or squash rebases) should also
> be copying notes (or if they do already, I haven't checked).
Squash rebases do but squash merges don't. Doing it "elegantly" would
probably involve caching the list of commits since the merge-bases,
which would be a bit of work.
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2011-02-12 14:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-10 21:13 Using Origin hashes to improve rebase behavior John Wiegley
2011-02-10 22:16 ` Johan Herland
2011-02-10 22:54 ` Jeff King
2011-02-11 3:14 ` John Wiegley
2011-02-11 4:45 ` Jeff King
2011-02-11 5:26 ` John Wiegley
2011-02-12 14:36 ` Thomas Rast [this message]
2011-02-11 10:02 ` skillzero
2011-02-11 11:40 ` Johan Herland
2011-02-11 19:03 ` Jeff King
2011-02-11 19:32 ` Junio C Hamano
2011-02-11 19:45 ` Jeff King
2011-02-20 17:49 ` Enrico Weigelt
2011-02-21 23:49 ` Dave Abrahams
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=201102121536.25789.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=johnw@boostpro.com \
--cc=peff@peff.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).