From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH v3 18/19] apply: document --3way option
Date: Wed, 13 Jun 2012 12:32:59 -0700 [thread overview]
Message-ID: <1339615980-19727-19-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1339615980-19727-1-git-send-email-gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/git-apply.txt | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index afd2c9a..634b84e 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -9,7 +9,7 @@ git-apply - Apply a patch to files and/or to the index
SYNOPSIS
--------
[verse]
-'git apply' [--stat] [--numstat] [--summary] [--check] [--index]
+'git apply' [--stat] [--numstat] [--summary] [--check] [--index] [--3way]
[--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
[--allow-binary-replacement | --binary] [--reject] [-z]
[-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
@@ -72,6 +72,15 @@ OPTIONS
cached data, apply the patch, and store the result in the index
without using the working tree. This implies `--index`.
+-3::
+--3way::
+ When the patch does not apply cleanly, fall back on 3-way merge if
+ the patch records the identity of blobs it is supposed to apply to,
+ and we have those blobs available locally, possibly leaving the
+ conflict markers in the files in the working tree for the user to
+ resolve. This option implies the `--index` option, and is incompatible
+ with the `--reject` and the `--cached` options.
+
--build-fake-ancestor=<file>::
Newer 'git diff' output has embedded 'index information'
for each blob to help identify the original version that
--
1.7.11.rc3.30.g3bdace2
next prev parent reply other threads:[~2012-06-13 19:33 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-13 19:32 [PATCH v3 00/19] "git apply --3way" Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 01/19] apply: fix an incomplete comment in check_patch() Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 02/19] apply: a bit more comments on PATH_TO_BE_DELETED Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 03/19] apply: clear_image() clears things a bit more Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 04/19] apply: refactor read_file_or_gitlink() Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 05/19] apply: factor out checkout_target() helper function Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 06/19] apply: split load_preimage() helper function out Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 07/19] apply: refactor "previous patch" logic Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 08/19] apply: further split load_preimage() Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 09/19] apply: move check_to_create_blob() closer to its sole caller Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 10/19] apply: move "already exists" logic to check_to_create() Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 11/19] apply: accept -3/--3way command line option Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 12/19] apply: fall back on three-way merge Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 13/19] apply: plug the three-way merge logic in Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 14/19] apply: move verify_index_match() higher Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 15/19] apply: --3way with add/add conflict Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 16/19] apply: register conflicted stages to the index Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 17/19] apply: allow rerere() upon --3way results Junio C Hamano
2012-06-13 19:32 ` Junio C Hamano [this message]
2012-06-13 19:33 ` [PATCH v3 19/19] apply --3way: tests Junio C Hamano
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=1339615980-19727-19-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--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).