blob: 910457d3b388f2c3b1dbe25f5609e3584fb4f113 [file] [log] [blame]
git-am - Apply a series of patches in a mailbox
'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way]
[--interactive] [--whitespace=<option>] <mbox>...
'git-am' [--skip | --resolved]
Splits mail messages in a mailbox into commit log message,
authorship information and patches, and applies them to the
current branch.
Add `Signed-off-by:` line to the commit message, using
the committer identity of yourself.
Instead of `.dotest` directory, use <dir> as a working
area to store extracted patches.
--utf8, --keep::
Pass `-u` and `-k` flags to `git-mailinfo` (see
Pass `--allow-binary-replacement` flag to `git-apply`
(see gitlink:git-apply[1]).
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
Skip the current patch. This is only meaningful when
restarting an aborted patch.
This flag is passed to the `git-apply` program that applies
the patch.
Run interactively, just like git-applymbox.
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.
When initially invoking it, you give it names of the mailboxes
to crunch. Upon seeing the first patch that does not apply, it
aborts in the middle, just like 'git-applymbox' does. You can
recover from this in one of two ways:
. skip the current one by re-running the command with '--skip'
. 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,
run `rm -f .dotest` before running the command with mailbox
gitlink:git-applymbox[1], gitlink:git-applypatch[1], gitlink:git-apply[1].
Written by Junio C Hamano <>
Documentation by Petr Baudis, Junio C Hamano and the git-list <>.
Part of the gitlink:git[7] suite