From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Alex Riesen <raa.lkml@gmail.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Miles Bader <miles@gnu.org>,
git@vger.kernel.org
Subject: Re: multiple-commit cherry-pick?
Date: Mon, 10 Nov 2008 12:41:37 -0800 [thread overview]
Message-ID: <7vabc75n5q.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.DEB.1.00.0811102054470.30769@pacific.mpi-cbg.de> (Johannes Schindelin's message of "Mon, 10 Nov 2008 20:58:11 +0100 (CET)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> On Sun, 9 Nov 2008, Alex Riesen wrote:
>
>> Oh, I am. But it is just so convenient to have range support for
>> commands which just show commits. Besides, git-show just errors out,
>> instead of producing the commits like git-log does.
>
> Have fun implementing the support, and then explaining to users why this
> shows only one commit:
>
> git show HEAD^..HEAD HEAD~10
I find what Alex says somewhat silly because show is always "no walk", and
range by definition means you need to walk.
But when you give that command line, Alex could also change the command to
show the HEAD and HEAD~10, by changing the way series of range parameters
are evaluated by the revision parsing machinery. You take HEAD^..HEAD and
come up with one set (that has only one commit, HEAD), you take the next
parameter HEAD~10 and come up with another set (that also has only one
commit, HEAD~10, because show does not walk), then you take union.
I personally do not want to see that happen, though. The way multiple
"ranges" that come from separate command line parameters combine using set
operator semantics is so useful to do something like...
git log ko/master..master ^maint
which is my way to ask "Which commits on master are the ones that I
haven't pushed out? By the way, I have pushed out maint already so I do
not want to see anything that is already in maint", where ko/master tracks
what I pushed out to the public repository at k.org; this query is used to
see if I can still rewrite commits when I find typo/thinko in them.
next prev parent reply other threads:[~2008-11-10 20:43 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-06 2:45 multiple-commit cherry-pick? Miles Bader
2008-11-06 3:24 ` Deskin Miller
2008-11-06 9:51 ` Björn Steinbrink
2008-11-06 12:14 ` Miles Bader
2008-11-06 12:26 ` Björn Steinbrink
2008-11-07 5:09 ` Miles Bader
2008-11-07 11:03 ` Björn Steinbrink
2008-11-07 11:46 ` Miles Bader
2008-11-06 21:37 ` Alex Riesen
2008-11-07 3:29 ` Linus Torvalds
2008-11-07 4:38 ` Miles Bader
2008-11-07 7:13 ` Alex Riesen
2008-11-07 5:00 ` Junio C Hamano
2008-11-07 7:12 ` Alex Riesen
2008-11-07 18:08 ` Linus Torvalds
2008-11-09 10:25 ` Alex Riesen
2008-11-10 19:58 ` Johannes Schindelin
2008-11-10 20:24 ` Alex Riesen
2008-11-10 21:31 ` Johannes Schindelin
2008-11-14 5:08 ` Chris Frey
2008-11-14 14:00 ` Johannes Schindelin
2008-11-14 16:11 ` Linus Torvalds
2008-11-14 16:59 ` Johannes Schindelin
2008-11-14 17:29 ` Junio C Hamano
2008-11-14 17:41 ` Linus Torvalds
2008-11-14 17:55 ` Linus Torvalds
2008-11-16 9:11 ` Pierre Habouzit
2008-11-14 18:38 ` Francis Galiegue
2008-11-10 20:41 ` Junio C Hamano [this message]
2008-11-10 21:34 ` Johannes Schindelin
2008-11-07 10:46 ` Michael Radziej
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=7vabc75n5q.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=miles@gnu.org \
--cc=raa.lkml@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