]>
Commit | Line | Data |
---|---|---|
42e2cba2 | 1 | git-am(1) |
05625af3 | 2 | ========= |
42e2cba2 PB |
3 | |
4 | NAME | |
5 | ---- | |
c3f0baac | 6 | git-am - Apply a series of patches from a mailbox |
42e2cba2 PB |
7 | |
8 | ||
9 | SYNOPSIS | |
10 | -------- | |
353ce815 | 11 | [verse] |
b1889c36 | 12 | 'git am' [--signoff] [--keep] [--utf8 | --no-utf8] |
cb3a160d | 13 | [--3way] [--interactive] |
b47dfe9e | 14 | [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] |
b80da424 | 15 | [--reject] |
356a32a2 | 16 | [<mbox> | <Maildir>...] |
3e5057a8 | 17 | 'git am' (--skip | --resolved | --abort) |
42e2cba2 PB |
18 | |
19 | DESCRIPTION | |
20 | ----------- | |
21 | Splits mail messages in a mailbox into commit log message, | |
22 | authorship information and patches, and applies them to the | |
23 | current branch. | |
24 | ||
baa720f5 JH |
25 | OPTIONS |
26 | ------- | |
d63bd9a2 | 27 | <mbox>|<Maildir>...:: |
d4144612 | 28 | The list of mailbox files to read patches from. If you do not |
d63bd9a2 FP |
29 | supply this argument, reads from the standard input. If you supply |
30 | directories, they'll be treated as Maildirs. | |
d4144612 | 31 | |
3240240f SB |
32 | -s:: |
33 | --signoff:: | |
baa720f5 JH |
34 | Add `Signed-off-by:` line to the commit message, using |
35 | the committer identity of yourself. | |
42e2cba2 | 36 | |
3240240f SB |
37 | -k:: |
38 | --keep:: | |
ba020ef5 | 39 | Pass `-k` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]). |
d84029b6 | 40 | |
3240240f SB |
41 | -u:: |
42 | --utf8:: | |
ba020ef5 | 43 | Pass `-u` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]). |
d84029b6 | 44 | The proposed commit log message taken from the e-mail |
870e0d61 | 45 | is re-coded into UTF-8 encoding (configuration variable |
d84029b6 JH |
46 | `i18n.commitencoding` can be used to specify project's |
47 | preferred encoding if it is not UTF-8). | |
48 | + | |
49 | This was optional in prior versions of git, but now it is the | |
50 | default. You could use `--no-utf8` to override this. | |
51 | ||
52 | --no-utf8:: | |
ba020ef5 | 53 | Pass `-n` flag to 'git-mailinfo' (see |
5162e697 | 54 | linkgit:git-mailinfo[1]). |
baa720f5 | 55 | |
3240240f SB |
56 | -3:: |
57 | --3way:: | |
baa720f5 JH |
58 | When the patch does not apply cleanly, fall back on |
59 | 3-way merge, if the patch records the identity of blobs | |
60 | it is supposed to apply to, and we have those blobs | |
870e0d61 | 61 | available locally. |
baa720f5 | 62 | |
8273c79a | 63 | --whitespace=<option>:: |
3240240f SB |
64 | -C<n>:: |
65 | -p<n>:: | |
b47dfe9e | 66 | --directory=<dir>:: |
b80da424 | 67 | --reject:: |
ba020ef5 | 68 | These flags are passed to the 'git-apply' (see linkgit:git-apply[1]) |
870e0d61 | 69 | program that applies |
67dad687 MT |
70 | the patch. |
71 | ||
3240240f SB |
72 | -i:: |
73 | --interactive:: | |
870e0d61 FL |
74 | Run interactively. |
75 | ||
76 | --skip:: | |
77 | Skip the current patch. This is only meaningful when | |
78 | restarting an aborted patch. | |
baa720f5 | 79 | |
3240240f SB |
80 | -r:: |
81 | --resolved:: | |
087b6742 JH |
82 | After a patch failure (e.g. attempting to apply |
83 | conflicting patch), the user has applied it by hand and | |
84 | the index file stores the result of the application. | |
85 | Make a commit using the authorship and commit log | |
86 | extracted from the e-mail message and the current index | |
87 | file, and continue. | |
baa720f5 | 88 | |
5c19f244 AR |
89 | --resolvemsg=<msg>:: |
90 | When a patch failure occurs, <msg> will be printed | |
91 | to the screen before exiting. This overrides the | |
92 | standard message informing you to use `--resolved` | |
93 | or `--skip` to handle the failure. This is solely | |
ba020ef5 | 94 | for internal use between 'git-rebase' and 'git-am'. |
5c19f244 | 95 | |
3e5057a8 NS |
96 | --abort:: |
97 | Restore the original branch and abort the patching operation. | |
98 | ||
baa720f5 JH |
99 | DISCUSSION |
100 | ---------- | |
101 | ||
2499857b JH |
102 | The commit author name is taken from the "From: " line of the |
103 | message, and commit author time is taken from the "Date: " line | |
104 | of the message. The "Subject: " line is used as the title of | |
105 | the commit, after stripping common prefix "[PATCH <anything>]". | |
106 | It is supposed to describe what the commit is about concisely as | |
107 | a one line text. | |
108 | ||
109 | The body of the message (iow, after a blank line that terminates | |
110 | RFC2822 headers) can begin with "Subject: " and "From: " lines | |
111 | that are different from those of the mail header, to override | |
112 | the values of these fields. | |
113 | ||
114 | The commit message is formed by the title taken from the | |
115 | "Subject: ", a blank line and the body of the message up to | |
116 | where the patch begins. Excess whitespaces at the end of the | |
117 | lines are automatically stripped. | |
118 | ||
119 | The patch is expected to be inline, directly following the | |
120 | message. Any line that is of form: | |
121 | ||
122 | * three-dashes and end-of-line, or | |
123 | * a line that begins with "diff -", or | |
124 | * a line that begins with "Index: " | |
125 | ||
126 | is taken as the beginning of a patch, and the commit log message | |
127 | is terminated before the first occurrence of such a line. | |
128 | ||
baa720f5 JH |
129 | When initially invoking it, you give it names of the mailboxes |
130 | to crunch. Upon seeing the first patch that does not apply, it | |
d45cc6e2 | 131 | aborts in the middle,. You can recover from this in one of two ways: |
baa720f5 | 132 | |
870e0d61 | 133 | . skip the current patch by re-running the command with '--skip' |
baa720f5 JH |
134 | option. |
135 | ||
087b6742 JH |
136 | . hand resolve the conflict in the working directory, and update |
137 | the index file to bring it in a state that the patch should | |
1e2ccd3a | 138 | have produced. Then run the command with '--resolved' option. |
baa720f5 | 139 | |
51ef1daa | 140 | The command refuses to process new mailboxes while `.git/rebase-apply` |
baa720f5 | 141 | directory exists, so if you decide to start over from scratch, |
51ef1daa | 142 | run `rm -f -r .git/rebase-apply` before running the command with mailbox |
baa720f5 | 143 | names. |
42e2cba2 | 144 | |
9869099b BG |
145 | Before any patches are applied, ORIG_HEAD is set to the tip of the |
146 | current branch. This is useful if you have problems with multiple | |
147 | commits, like running 'git am' on the wrong branch or an error in the | |
148 | commits that is more easily fixed by changing the mailbox (e.g. | |
149 | errors in the "From:" lines). | |
150 | ||
42e2cba2 PB |
151 | |
152 | SEE ALSO | |
153 | -------- | |
5162e697 | 154 | linkgit:git-apply[1]. |
42e2cba2 PB |
155 | |
156 | ||
157 | Author | |
158 | ------ | |
59eb68aa | 159 | Written by Junio C Hamano <gitster@pobox.com> |
42e2cba2 PB |
160 | |
161 | Documentation | |
162 | -------------- | |
163 | Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>. | |
164 | ||
42e2cba2 PB |
165 | GIT |
166 | --- | |
9e1f0a85 | 167 | Part of the linkgit:git[1] suite |