All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: "Michael S. Tsirkin" <mst@mellanox.co.il>
Cc: git@vger.kernel.org
Subject: Re: git rebase: unexpected conflict
Date: Wed, 07 Feb 2007 13:22:26 -0800	[thread overview]
Message-ID: <7vired64tp.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20070207211422.GH12140@mellanox.co.il> (Michael S. Tsirkin's message of "Wed, 7 Feb 2007 23:14:22 +0200")

"Michael S. Tsirkin" <mst@mellanox.co.il> writes:

>> > git-show can not limit its output to just the part of patch
>> > that affects the list of files I give, the way git-diff can.
>> > Would such an extension be a good idea?
>> 
>> It is a good idea and I think it is implemented.
>> 
>> 	$ git-show <commit>... --- <paths>
>
> Yes, this works. But this seems undocumented. Right?

Somehow I think I saw Linus's answer to this exact topic a few
hours ago.

This manual page describes only the most frequently used options.

  reply	other threads:[~2007-02-07 21:22 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-04 19:05 git rebase: unexpected conflict Michael S. Tsirkin
2007-02-04 19:33 ` Jakub Narebski
2007-02-04 20:53   ` Michael S. Tsirkin
2007-02-07 19:32 ` Junio C Hamano
2007-02-07 20:05   ` Michael S. Tsirkin
2007-02-07 20:13     ` Junio C Hamano
2007-02-07 20:31       ` Michael S. Tsirkin
2007-02-07 20:37         ` Junio C Hamano
2007-02-07 21:14           ` Michael S. Tsirkin
2007-02-07 21:22             ` Junio C Hamano [this message]
2007-02-08 13:39               ` Michael S. Tsirkin
2007-02-08 22:27                 ` Junio C Hamano
2007-02-08 22:29                   ` Michael S. Tsirkin
2007-02-09 10:23           ` Michael S. Tsirkin
2007-02-07 20:30     ` Linus Torvalds
2007-02-07 20:22   ` Linus Torvalds

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=7vired64tp.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=git@vger.kernel.org \
    --cc=mst@mellanox.co.il \
    /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.