SYNOPSIS
--------
-'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--3way] <mbox>...
-'git-am' [--skip]
+[verse]
+'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>...
+'git-am' [--skip | --resolved]
DESCRIPTION
-----------
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
--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
----------
. 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,