X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit-am.txt;h=a415fe24c3dbf076145cfa44a0674875e3d2f49d;hb=2414721b194453f058079d897d13c4e377f92dc6;hp=704dc514de1daa29a0c72ce336ad6d04ea34d701;hpb=e634aec752642dcf86c3fc82025e43381d6768c2;p=git.git
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 704dc514..a415fe24 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -8,8 +8,8 @@ git-am - Apply a series of patches in a mailbox
SYNOPSIS
--------
-'git-am' [--signoff] [--dotest=
] [--utf8] [--3way] ...
-'git-am' [--skip]
+'git-am' [--signoff] [--dotest=] [--utf8] [--binary] [--3way] ...
+'git-am' [--skip | --resolved]
DESCRIPTION
-----------
@@ -28,9 +28,13 @@ OPTIONS
area to store extracted patches.
--utf8, --keep::
- Pass `--utf8` and `--keep` flags to `git-mailinfo` (see
+ Pass `-u` and `-k` flags to `git-mailinfo` (see
gitlink:git-mailinfo[1]).
+--binary::
+ Pass `--allow-binary-replacement` flag to `git-apply`
+ (see gitlink:git-apply[1]).
+
--3way::
When the patch does not apply cleanly, fall back on
3-way merge, if the patch records the identity of blobs
@@ -44,6 +48,13 @@ OPTIONS
--interactive::
Run interactively, just like git-applymbox.
+--resolved::
+ After a patch failure (e.g. attempting to apply
+ conflicting patch), the user has applied it by hand and
+ the index file stores the result of the application.
+ Make a commit using the authorship and commit log
+ extracted from the e-mail message and the current index
+ file, and continue.
DISCUSSION
----------
@@ -56,12 +67,9 @@ recover from this in one of two ways:
. skip the current one by re-running the command with '--skip'
option.
-. hand resolve the conflict in the working directory, run 'git
- diff HEAD' to extract the merge result into a patch form and
- replacing the patch in .dotest/patch file. After doing this,
- run `git-reset --hard HEAD` to bring the working tree to the
- state before half-applying the patch, then re-run the command
- without any options.
+. hand resolve the conflict in the working directory, and update
+ the index file to bring it in a state that the patch should
+ have produced. Then run the command with '--resolved' option.
The command refuses to process new mailboxes while `.dotest`
directory exists, so if you decide to start over from scratch,
@@ -82,8 +90,6 @@ Documentation
--------------
Documentation by Petr Baudis, Junio C Hamano and the git-list .
-This manual page is a stub. You can help the git documentation by expanding it.
-
GIT
---
Part of the gitlink:git[7] suite