From: Jay Soffian <jaysoffian@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Aghiles <aghilesk@gmail.com>,
Sverre Rabbelier <srabbelier@gmail.com>,
git list <git@vger.kernel.org>
Subject: Re: potential improvement to 'git log' with a range
Date: Thu, 24 Jun 2010 18:49:24 -0400 [thread overview]
Message-ID: <AANLkTiloAQmjAMVOROzBHkLAAIDj-KNFNcfXC9pdwDf5@mail.gmail.com> (raw)
In-Reply-To: <7v8w64cguk.fsf@alter.siamese.dyndns.org>
On Thu, Jun 24, 2010 at 4:31 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Heh, this is a totally different operation to compare the tree before and
> after the merge.
>
> What "log merge^..merge^2" does is to list the commits we merged from the
> point of view of the person who did the merge. I haven't found the need
> for a short-cut for that myself, but in any case, I think such a feature
> belongs less to "show" (which is about "inspecting a single object") than
> to "log" (which is about "give me the sequence").
>
> You may want to look into merge.log variable if you find yourself wanting
> to do that often with your history, though.
Familiar with that and sadly insufficient. My merges often contain
100+ commits which is beyond what merge.log truncates. But more
importantly, I'm often inspecting the commits:
git log ..MERGE_HEAD -Scontent_to_watch_out_for
git log ..MERGE_HEAD -- /path/to/watch/out/for
etc. But sometimes I have to do this type of inspection after the
fact, which is what leads to the merge^..merge^2.
Perhaps the right place for such syntactic sugar would be in
rev-parse. Something like:
o A suffix ^{m..n} (i.e. rev^{1..2}) when rev is a merge commit
expands to rev^m..rev^n and is only valid in contexts that take a
range. 'm' and 'n' may be left out in which case they are assume to be
1 and 2. (i.e rev^{..} is rev^1..rev^2).
But I haven't entirely thought this through. :-)
j.
prev parent reply other threads:[~2010-06-24 22:49 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-09 23:24 potential improvement to 'git log' with a range Aghiles
2010-04-09 23:33 ` Santi Béjar
2010-04-09 23:33 ` Sverre Rabbelier
2010-04-10 0:13 ` Aghiles
2010-04-10 0:16 ` Sverre Rabbelier
2010-04-10 1:20 ` Linus Torvalds
2010-04-11 20:31 ` Aghiles
2010-04-11 21:32 ` Jakub Narebski
2010-06-23 17:05 ` Martin Geisler
2010-06-23 18:02 ` Jakub Narebski
2010-06-23 19:19 ` Martin Geisler
2010-06-23 21:24 ` Jakub Narebski
2010-06-23 22:04 ` Martin Geisler
2010-06-23 19:36 ` Jay Soffian
2010-06-23 20:26 ` Junio C Hamano
2010-06-23 20:45 ` Jay Soffian
2010-06-24 20:31 ` Junio C Hamano
2010-06-24 22:49 ` Jay Soffian [this message]
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=AANLkTiloAQmjAMVOROzBHkLAAIDj-KNFNcfXC9pdwDf5@mail.gmail.com \
--to=jaysoffian@gmail.com \
--cc=aghilesk@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=srabbelier@gmail.com \
--cc=torvalds@linux-foundation.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 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).