6 git-am - Apply a series of patches from a mailbox
12 'git am' [--signoff] [--keep] [--utf8 | --no-utf8]
13 [--3way] [--interactive] [--committer-date-is-author-date]
14 [--ignore-date] [--ignore-space-change | --ignore-whitespace]
15 [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
16 [--reject] [-q | --quiet]
17 [<mbox> | <Maildir>...]
18 'git am' (--skip | --resolved | --abort)
22 Splits mail messages in a mailbox into commit log message,
23 authorship information and patches, and applies them to the
29 The list of mailbox files to read patches from. If you do not
30 supply this argument, the command reads from the standard input.
31 If you supply directories, they will be treated as Maildirs.
35 Add a `Signed-off-by:` line to the commit message, using
36 the committer identity of yourself.
40 Pass `-k` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]).
44 Be quiet. Only print error messages.
48 Pass `-u` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]).
49 The proposed commit log message taken from the e-mail
50 is re-coded into UTF-8 encoding (configuration variable
51 `i18n.commitencoding` can be used to specify project's
52 preferred encoding if it is not UTF-8).
54 This was optional in prior versions of git, but now it is the
55 default. You can use `--no-utf8` to override this.
58 Pass `-n` flag to 'git-mailinfo' (see
59 linkgit:git-mailinfo[1]).
63 When the patch does not apply cleanly, fall back on
64 3-way merge if the patch records the identity of blobs
65 it is supposed to apply to and we have those blobs
69 --ignore-space-change::
71 --whitespace=<option>::
76 These flags are passed to the 'git-apply' (see linkgit:git-apply[1])
84 --committer-date-is-author-date::
85 By default the command records the date from the e-mail
86 message as the commit author date, and uses the time of
87 commit creation as the committer date. This allows the
88 user to lie about the committer date by using the same
89 value as the author date.
92 By default the command records the date from the e-mail
93 message as the commit author date, and uses the time of
94 commit creation as the committer date. This allows the
95 user to lie about the author date by using the same
96 value as the committer date.
99 Skip the current patch. This is only meaningful when
100 restarting an aborted patch.
104 After a patch failure (e.g. attempting to apply
105 conflicting patch), the user has applied it by hand and
106 the index file stores the result of the application.
107 Make a commit using the authorship and commit log
108 extracted from the e-mail message and the current index
112 When a patch failure occurs, <msg> will be printed
113 to the screen before exiting. This overrides the
114 standard message informing you to use `--resolved`
115 or `--skip` to handle the failure. This is solely
116 for internal use between 'git-rebase' and 'git-am'.
119 Restore the original branch and abort the patching operation.
124 The commit author name is taken from the "From: " line of the
125 message, and commit author date is taken from the "Date: " line
126 of the message. The "Subject: " line is used as the title of
127 the commit, after stripping common prefix "[PATCH <anything>]".
128 The "Subject: " line is supposed to concisely describe what the
129 commit is about in one line of text.
131 A line that mainly consists of scissors (either ">8" or "8<") and
132 perforation (dash "-") marks is called a scissors line, and is used to
133 request the reader to cut the message at that line. If such a line
134 appears in the body of the message before the patch, everything before it
135 (including the scissors line itself) is ignored. This is useful if you
136 want to begin your message in a discussion thread with comments and
137 suggestions on the message you are responding to, and to conclude it with
138 a patch submission, separating the discussion and the beginning of the
139 proposed commit log message with a scissors line.
141 "From: " and "Subject: " lines starting the body override the respective
142 commit author name and title values taken from the headers.
144 The commit message is formed by the title taken from the
145 "Subject: ", a blank line and the body of the message up to
146 where the patch begins. Excess whitespace at the end of each
147 line is automatically stripped.
149 The patch is expected to be inline, directly following the
150 message. Any line that is of the form:
152 * three-dashes and end-of-line, or
153 * a line that begins with "diff -", or
154 * a line that begins with "Index: "
156 is taken as the beginning of a patch, and the commit log message
157 is terminated before the first occurrence of such a line.
159 When initially invoking `git am`, you give it the names of the mailboxes
160 to process. Upon seeing the first patch that does not apply, it
161 aborts in the middle. You can recover from this in one of two ways:
163 . skip the current patch by re-running the command with the '--skip'
166 . hand resolve the conflict in the working directory, and update
167 the index file to bring it into a state that the patch should
168 have produced. Then run the command with the '--resolved' option.
170 The command refuses to process new mailboxes while the `.git/rebase-apply`
171 directory exists, so if you decide to start over from scratch,
172 run `rm -f -r .git/rebase-apply` before running the command with mailbox
175 Before any patches are applied, ORIG_HEAD is set to the tip of the
176 current branch. This is useful if you have problems with multiple
177 commits, like running 'git am' on the wrong branch or an error in the
178 commits that is more easily fixed by changing the mailbox (e.g.
179 errors in the "From:" lines).
184 linkgit:git-apply[1].
189 Written by Junio C Hamano <gitster@pobox.com>
193 Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.
197 Part of the linkgit:git[1] suite