From: Simon 'corecode' Schubert Date: Tue, 20 Feb 2007 00:36:40 GMT Subject: Re: [PATCH] Teach 'git apply' to look at $GIT_DIR/config Message-ID: <45DA4298.7010002@fs.ei.tum.de> In-Reply-To: <7vwt2d4s6c.fsf@assigned-by-dhcp.cox.net> 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 / \