Apply a series of patches from a mailbox
gitam [ --signoff] [ --keep] [ --[no -]keep -cr] [ --[no -]utf8] [ --[no -]3way] [ --interactive] [ --committer -date -is -author -date] [ --ignore -date] [ --ignore -space -change | --ignore -whitespace] [ --whitespace=<option>] [ -C<n>] [ -p<n>] [ --directory=<dir>] [ --exclude=<path>] [ --include=<path>] [ --reject] [ -q | --quiet] [ --[no -]scissors] [ -S[<keyid>]] [ --patch -format=<format>] [(<mbox> | <Maildir>) ...] gitam ( --continue | --skip | --abort | --quit | --show -current -patch)
(<mbox>|<Maildir>) ... The list of mailbox files to read patches from . If you do not supply this argument, the command reads from the standard input . If you supply directories, they will be treated as Maildirs .
-s, --signoff Add a Signed-off -by: line to the commit message, using the committer identity of yourself . See the signoff option in git-commit (1) for more information .
-k, --keep Pass -k flag to gitmailinfo (see git-mailinfo (1)).
--keep -non -patch Pass -b flag to gitmailinfo (see git-mailinfo (1)).
--[no -]keep -cr With --keep -cr ,call gitmailsplit (see git-mailsplit (1))with the same option, to prevent it from stripping CR at the end of lines . am.keepcr configuration variable can be used to specify the default behaviour . --no -keep -cr is useful to override am.keepcr .
-c, --scissors Remove everything in body before a scissors line (see git-mailinfo (1)). Can be activated by default using the mailinfo.scissors configuration variable .
--no -scissors Ignore scissors lines (see git-mailinfo (1)).
-m, --message -id Pass the -m flag to gitmailinfo (see git-mailinfo (1)),so that the Message -ID header is added to the commit message . The am.messageid configuration variable can be used to specify the default behaviour .
--no -message -id Do not add the Message -ID header to the commit message . no-message -id is useful to override am.messageid .
-q, --quiet Be quiet . Only print error messages .
-u, --utf8 Pass -u flag to gitmailinfo (see git-mailinfo (1)). The proposed commit log message taken from the e -mail is re -coded into UTF -8 encoding (configuration variable i18n.commitencoding can be used to specify project preferred encoding if it is not UTF -8) .
--no -utf8 Pass -n flag to gitmailinfo (see git-mailinfo (1)).
-3, --3way, --no -3way 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 available locally . --no -3way can be used to override am .threeWay configuration variable . For more information, see am .threeWay in git-config (1).
--rerere -autoupdate, --no -rerere -autoupdate Allow the rerere mechanism to update the index with the result of auto -conflict resolution if possible .
--ignore -space -change, --ignore -whitespace, --whitespace=<option>, -C<n>, -p<n>, --directory=<dir>, --exclude=<path>, --include=<path>, --reject These flags are passed to the gitapply (see git-apply (1))program that applies the patch .
--patch -format By default the command will try to detect the patch format automatically . This option allows the user to bypass the automatic detection and specify the patch format that the patch(es) should be interpreted as . Valid formats are mbox, mboxrd, stgit, stgit -series and hg .
-i, --interactive Run interactively .
--committer -date -is -author -date By default the command records the date from the e -mail message as the commit author date, and uses the time of commit creation as the committer date . This allows the user to lie about the committer date by using the same value as the author date .
--ignore -date By default the command records the date from the e -mail message as the commit author date, and uses the time of commit creation as the committer date . This allows the user to lie about the author date by using the same value as the committer date .
--skip Skip the current patch . This is only meaningful when restarting an aborted patch .
-S[<keyid>], --gpg -sign[=<keyid>] GPG -sign commits . The keyid argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space .
--continue, -r, --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 .
--resolvemsg=<msg> When a patch failure occurs, <msg> will be printed to the screen before exiting . This overrides the standard message informing you to use --continue or --skip to handle the failure . This is solely for internal use between gitrebase and gitam .
--abort Restore the original branch and abort the patching operation .
--quit Abort the patching operation but keep HEAD and the index untouched .
--show -current -patch Show the patch being applied when "git am" is stopped because of conflicts .
2.3 three -dashes and end -of -line, or '-04' '+03' .sp -1
2.3 a line that begins with "diff -", or '-04' '+03' .sp -1
2.3 a line that begins with "Index: " is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line . When initially invoking gitam ,you give it the names of the mailboxes to process . Upon seeing the first patch that does not apply, it aborts in the middle . You can recover from this in one of two ways: '-04' 1. '+01' .sp -1
" 1." 4.2 skip the current patch by re -running the command with the --skip option . '-04' 2. '+01' .sp -1
" 2." 4.2 hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced . Then run the command with the --continue option . The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run gitam --abort before running the command with mailbox names . Before any patches are applied, ORIG_HEAD is set to the tip of the current branch . This is useful if you have problems with multiple commits, like running gitam on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e .g . errors in the "From:" lines) .