From: "Shawn O. Pearce" <spearce@spearce.org>
To: Joshua Williams <joshua.williams@qlogic.com>
Cc: git@vger.kernel.org,
Jay Blakeborough <jay.blakeborough@qlogic.com>,
Bill Lohse <bill.lohse@qlogic.com>
Subject: Re: [GIT-GUI PATCH] call prepare-commit-msg hook
Date: Wed, 24 Sep 2008 12:46:22 -0700 [thread overview]
Message-ID: <20080924194622.GF3669@spearce.org> (raw)
In-Reply-To: <48DA90F9.8070606@qlogic.com>
Joshua Williams <joshua.williams@qlogic.com> wrote:
>>
>> Can you please try to put this onto my current git-gui tree?
>> I don't have the base 10d8a44 object so I can't 3-way merge
>> this in, and the patch doesn't apply cleanly anymore.
>
> Absolutely. Here it is:
I'm not sure what happened, but any line of context got an extra
space inserted at the front of it. I had to go rip out the extra
spaces from every line of context to get git-apply to process the
patch.
Anyway, its applied now. Thanks.
--
Shawn.
prev parent reply other threads:[~2008-09-24 19:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-16 21:12 [GIT-GUI PATCH] call prepare-commit-msg hook Joshua Williams
2008-09-16 22:05 ` Joshua Williams
2008-09-24 17:04 ` Shawn O. Pearce
2008-09-24 19:11 ` Joshua Williams
2008-09-24 19:46 ` Shawn O. Pearce [this message]
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=20080924194622.GF3669@spearce.org \
--to=spearce@spearce.org \
--cc=bill.lohse@qlogic.com \
--cc=git@vger.kernel.org \
--cc=jay.blakeborough@qlogic.com \
--cc=joshua.williams@qlogic.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 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 NNTP newsgroup(s).