'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>...
'git-am' [--skip | --resolved]
'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>...
'git-am' [--skip | --resolved]
. hand resolve the conflict in the working directory, and update
the index file to bring it in a state that the patch should
. hand resolve the conflict in the working directory, and update
the index file to bring it in a state that the patch should
The command refuses to process new mailboxes while `.dotest`
directory exists, so if you decide to start over from scratch,
The command refuses to process new mailboxes while `.dotest`
directory exists, so if you decide to start over from scratch,