From: Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
To: Junio C Hamano <junkio@cox.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
peff@peff.net, git@vger.kernel.org
Subject: Re: [PATCH] Teach 'git apply' to look at $GIT_DIR/config
Date: Tue, 20 Feb 2007 01:36:40 +0100 [thread overview]
Message-ID: <45DA4298.7010002@fs.ei.tum.de> (raw)
In-Reply-To: <7vwt2d4s6c.fsf@assigned-by-dhcp.cox.net>
[-- Attachment #1: Type: text/plain, Size: 1027 bytes --]
Junio C Hamano wrote:
> If the patch were what you made by running "GNU diff" inside a
> corresponding subdirectory of another repository (perhaps you
> wanted to feed uncommitted changes from there to this
> repository), then you can always use "GNU patch" to apply. If
> you made such a one-shot patch using git-diff, it will tell you
> the correct directory to apply to, so...
The difference there is that GNU/Larry Wall diff does not prepend a/ and b/ to the paths. Maybe use this as an indicator for "this patch is relative to project root" vs. "this patch doesn't know where it wants to be applied".
A parameter --subdir, or even plain -pN could mean "apply this patch here, now."
cheers
simon
--
Serve - BSD +++ RENT this banner advert +++ ASCII Ribbon /"\
Work - Mac +++ space for low €€€ NOW!1 +++ Campaign \ /
Party Enjoy Relax | http://dragonflybsd.org Against HTML \
Dude 2c 2 the max ! http://golden-apple.biz Mail + News / \
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 252 bytes --]
next prev parent reply other threads:[~2007-02-20 0:36 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-17 20:37 [PATCH] Teach core.autocrlf to 'git apply' Junio C Hamano
2007-02-17 21:12 ` [PATCH] Teach 'git apply' to look at $GIT_DIR/config Junio C Hamano
2007-02-17 23:26 ` Jeff King
2007-02-17 23:31 ` Junio C Hamano
2007-02-17 23:32 ` Jeff King
2007-02-19 22:57 ` Linus Torvalds
2007-02-19 23:04 ` Shawn O. Pearce
2007-02-19 23:14 ` Junio C Hamano
2007-02-19 23:37 ` Linus Torvalds
2007-02-19 23:57 ` Junio C Hamano
2007-02-20 0:11 ` Linus Torvalds
2007-02-20 0:35 ` Junio C Hamano
2007-02-20 0:53 ` Johannes Schindelin
2007-02-20 1:29 ` Junio C Hamano
2007-02-20 1:43 ` Johannes Schindelin
2007-02-20 1:57 ` [PATCH] git-apply: require -p<n> when working in a subdirectory Junio C Hamano
2007-02-20 2:33 ` [PATCH] apply: fix memory leak in prefix_one() Johannes Schindelin
2007-02-20 2:39 ` Junio C Hamano
2007-02-20 2:45 ` Johannes Schindelin
2007-02-20 1:58 ` [PATCH] git-apply: do not lose cwd when run from a subdirectory Junio C Hamano
2007-02-20 1:28 ` [PATCH] Teach 'git apply' to look at $GIT_DIR/config Junio C Hamano
2007-02-20 1:38 ` Linus Torvalds
2007-02-21 5:39 ` Daniel Barkalow
2007-02-21 11:22 ` Junio C Hamano
2007-02-21 17:00 ` Daniel Barkalow
2007-02-21 16:44 ` Linus Torvalds
2007-02-21 19:35 ` Junio C Hamano
2007-02-21 22:31 ` [PATCH] git-apply: notice "diff --git" patch again Junio C Hamano
2007-02-22 0:24 ` [PATCH] git-apply: guess correct -p<n> value for non-git patches Junio C Hamano
2007-02-20 0:16 ` [PATCH] Teach 'git apply' to look at $GIT_DIR/config Johannes Schindelin
2007-02-20 0:36 ` Simon 'corecode' Schubert [this message]
2007-02-18 0:08 ` Johannes Schindelin
2007-02-18 0:28 ` Junio C Hamano
2007-02-18 0:40 ` Johannes Schindelin
2007-02-18 1:03 ` Junio C Hamano
2007-02-18 1:15 ` Johannes Schindelin
2007-02-18 1:47 ` Junio C Hamano
2007-02-18 2:00 ` Johannes Schindelin
2007-02-18 2:15 ` Junio C Hamano
2007-02-18 11:40 ` Johannes Schindelin
2007-02-18 1:48 ` Jakub Narebski
2007-02-18 0:06 ` Johannes Schindelin
2007-02-18 0:31 ` Junio C Hamano
2007-02-18 0:53 ` Johannes Schindelin
2007-02-18 1:20 ` Junio C Hamano
2007-02-18 1:29 ` Johannes Schindelin
2007-02-18 1:48 ` Junio C Hamano
2007-02-18 2:01 ` Johannes Schindelin
2007-02-18 2:10 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=45DA4298.7010002@fs.ei.tum.de \
--to=corecode@fs.ei.tum.de \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=peff@peff.net \
--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 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.