From: Linus Torvalds <torvalds@osdl.org>
To: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Junio C Hamano <junkio@cox.net>, git@vger.kernel.org
Subject: Re: [PATCH] Fall back to three-way merge when applying a patch.
Date: Thu, 6 Oct 2005 07:35:58 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.64.0510060731560.31407@g5.osdl.org> (raw)
In-Reply-To: <m1y8575i9y.fsf@ebiederm.dsl.xmission.com>
On Wed, 5 Oct 2005, Eric W. Biederman wrote:
>
> Ah. I had missed that git-whatchanged can be given a filename that is
> nice. One of the better kept secrets of git. That makes my whole
> question worthwhile :)
That's definitely not a secret - it was part of the whole point of
git-whatchanged. It's the native git version of "annotate", and I
personally find it much more useful.
It's not even just a filename. You can do
git-whatchanged -p drivers/scsi/ include/scsi
to limit the set to those two subdirectories. IOW, you can give
git-whatchanged an arbitrary list of individual pathnames or directory
names.
> But if you happen to have at least the file level sha1 you can
> actually know if the patch was against what you think it is against.
Yes, a file-level SHA1 may be useful. On the other hand, I suspect that by
that time (since you have to search for the version anyway) you might as
well have the "just try to apply the patch" approach. It's basically the
same search space.
Linus
next prev parent reply other threads:[~2005-10-06 14:36 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-05 0:46 [PATCH] Fall back to three-way merge when applying a patch Junio C Hamano
2005-10-05 4:56 ` Linus Torvalds
2005-10-05 6:58 ` Junio C Hamano
2005-10-05 14:30 ` Linus Torvalds
2005-10-06 0:03 ` Junio C Hamano
2005-10-06 1:59 ` Eric W. Biederman
2005-10-06 2:18 ` Linus Torvalds
2005-10-06 4:17 ` Junio C Hamano
2005-10-06 5:25 ` Eric W. Biederman
2005-10-06 14:35 ` Linus Torvalds [this message]
2005-10-06 14:52 ` Eric W. Biederman
2005-10-06 14:59 ` Linus Torvalds
2005-10-06 17:07 ` Eric W. Biederman
2005-10-07 2:33 ` [PATCH] Show original and resulting blob object info in diff output Junio C Hamano
2005-10-07 4:47 ` Linus Torvalds
2005-10-07 5:16 ` Junio C Hamano
2005-10-06 7:33 ` [PATCH] Fall back to three-way merge when applying a patch Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0510060731560.31407@g5.osdl.org \
--to=torvalds@osdl.org \
--cc=ebiederm@xmission.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).