1git-am(1) 2========= 3 4NAME 5---- 6git-am - Apply a series of patches in a mailbox 7 8 9SYNOPSIS 10-------- 11'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--3way] <mbox>... 12'git-am' [--skip] 13 14DESCRIPTION 15----------- 16Splits mail messages in a mailbox into commit log message, 17authorship information and patches, and applies them to the 18current branch. 19 20OPTIONS 21------- 22--signoff:: 23 Add `Signed-off-by:` line to the commit message, using 24 the committer identity of yourself. 25 26--dotest=<dir>:: 27 Instead of `.dotest` directory, use <dir> as a working 28 area to store extracted patches. 29 30--utf8, --keep:: 31 Pass `--utf8` and `--keep` flags to `git-mailinfo` (see 32 gitlink:git-mailinfo[1]). 33 34--3way:: 35 When the patch does not apply cleanly, fall back on 36 3-way merge, if the patch records the identity of blobs 37 it is supposed to apply to, and we have those blobs 38 locally. 39 40--skip:: 41 Skip the current patch. This is only meaningful when 42 restarting an aborted patch. 43 44--interactive:: 45 Run interactively, just like git-applymbox. 46 47 48DISCUSSION 49---------- 50 51When initially invoking it, you give it names of the mailboxes 52to crunch. Upon seeing the first patch that does not apply, it 53aborts in the middle, just like 'git-applymbox' does. You can 54recover from this in one of two ways: 55 56. skip the current one by re-running the command with '--skip' 57 option. 58 59. hand resolve the conflict in the working directory, run 'git 60 diff HEAD' to extract the merge result into a patch form and 61 replacing the patch in .dotest/patch file. After doing this, 62 run `git-reset --hard HEAD` to bring the working tree to the 63 state before half-applying the patch, then re-run the command 64 without any options. 65 66The command refuses to process new mailboxes while `.dotest` 67directory exists, so if you decide to start over from scratch, 68run `rm -f .dotest` before running the command with mailbox 69names. 70 71 72SEE ALSO 73-------- 74gitlink:git-applymbox[1], gitlink:git-applypatch[1]. 75 76 77Author 78------ 79Written by Junio C Hamano <junkio@cox.net> 80 81Documentation 82-------------- 83Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>. 84 85This manual page is a stub. You can help the git documentation by expanding it. 86 87GIT 88--- 89Part of the gitlink:git[7] suite 90