From: Junio C Hamano <junkio@cox.net>
To: Greg KH <greg@kroah.com>
Cc: git@vger.kernel.org
Subject: Re: git applymbox is too anal
Date: Thu, 08 Sep 2005 18:03:47 -0700 [thread overview]
Message-ID: <7vd5njrr0s.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20050908233906.GA7976@kroah.com> (Greg KH's message of "Thu, 8 Sep 2005 16:39:06 -0700")
Greg KH <greg@kroah.com> writes:
> So, the patch shows that there was another line at the end of the file,
> while in reality it isn't (this is due to me excluding a patch from the
> series that I'm applying due to other reasons.)
>
> Is this something that git can handle without me editing the patch by
> hand? :)
Linus was quite strict about rejecting any fuzz, but I am
sympathetic to the cause. I do not mind if somebody comes up
with a patch to add '--fuzz' option to git-apply; we can try
applying first without --fuzz and ask the user if he wants one
from 'git applymbox' main loop when it fails.
next prev parent reply other threads:[~2005-09-09 1:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-08 23:25 git applymbox is too anal Greg KH
2005-09-08 23:39 ` Greg KH
2005-09-09 1:03 ` Junio C Hamano [this message]
2005-09-09 0:58 ` Linus Torvalds
2005-09-09 17:07 ` Greg KH
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=7vd5njrr0s.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=greg@kroah.com \
/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.