From: Ori Avtalion <ori@avtalion.name>
To: git@vger.kernel.org
Subject: git-apply that handles rejects like merge conflicts
Date: Tue, 08 Nov 2011 00:10:48 +0200 [thread overview]
Message-ID: <4EB85768.1060508@avtalion.name> (raw)
Hey,
I'm trying to get git-apply to apply patches, and let me handle the
conflicts in a way I'm comfortable with -- by staging the "successful"
hunks and leaving conflict markers in the working tree.
With the available flags, I seem to only be able to have successful
hunks in the index, and rejected ones in patch-like .rej files.
Is there a way to accomplish this? If not, does anyone think it's a good
idea?
-Ori
next reply other threads:[~2011-11-07 22:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-07 22:10 Ori Avtalion [this message]
2011-11-07 22:55 ` git-apply that handles rejects like merge conflicts Jeff King
2011-11-07 23:18 ` Ori Avtalion
2011-11-07 23:45 ` Junio C Hamano
2011-11-08 5:46 ` Jeff King
2011-11-08 6:15 ` Junio C Hamano
2011-11-08 20:50 ` Ori Avtalion
2011-11-08 21:00 ` Jeff King
2011-11-08 8:52 ` Bert Wesarg
2011-11-08 16:10 ` Jeff King
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=4EB85768.1060508@avtalion.name \
--to=ori@avtalion.name \
--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 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.