From: Scott Parish <sRp@srparish.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: how to deal with conflicts after "git stash apply"?
Date: Sun, 21 Oct 2007 21:39:33 -0700 [thread overview]
Message-ID: <20071022043933.GL16291@srparish.net> (raw)
In-Reply-To: <Pine.LNX.4.64.0710212338200.25221@racer.site>
> You should have a look into Documentation/diff-format.txt (section
> "combined diff format") to learn more.
Ah, thanks for the pointer; i hadn't realized that this wasn't
standard diff format. With this and what Shawn said, it all makes
sense now.
sRp
--
Scott Parish
http://srparish.net/
prev parent reply other threads:[~2007-10-22 4:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-21 22:32 how to deal with conflicts after "git stash apply"? Scott Parish
2007-10-21 22:40 ` Johannes Schindelin
2007-10-22 4:26 ` Shawn O. Pearce
2007-10-22 4:39 ` Scott Parish [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=20071022043933.GL16291@srparish.net \
--to=srp@srparish.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.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 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).