]>
Commit | Line | Data |
---|---|---|
215a7ad1 JH |
1 | git-commit(1) |
2 | ============= | |
62033318 JH |
3 | |
4 | NAME | |
5 | ---- | |
c3f0baac | 6 | git-commit - Record changes to the repository |
62033318 JH |
7 | |
8 | SYNOPSIS | |
9 | -------- | |
353ce815 | 10 | [verse] |
3a5d13a3 | 11 | 'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run] |
89ac1223 | 12 | [(-c | -C | --fixup | --squash) <commit>] [-F <file> | -m <msg>] |
d71b8ba7 PN |
13 | [--reset-author] [--allow-empty] [--allow-empty-message] [--no-verify] |
14 | [-e] [--author=<author>] [--date=<date>] [--cleanup=<mode>] | |
9bec60d3 | 15 | [--status | --no-status] [-i | -o] [--] [<file>...] |
62033318 JH |
16 | |
17 | DESCRIPTION | |
18 | ----------- | |
d69806d1 JN |
19 | Stores the current contents of the index in a new commit along |
20 | with a log message from the user describing the changes. | |
62033318 | 21 | |
a76c2acb | 22 | The content to be added can be specified in several ways: |
f9935bf9 | 23 | |
0b444cdb | 24 | 1. by using 'git add' to incrementally "add" changes to the |
a76c2acb | 25 | index before using the 'commit' command (Note: even modified |
6c96753d | 26 | files must be "added"); |
5bfc4f23 | 27 | |
0b444cdb | 28 | 2. by using 'git rm' to remove files from the working tree |
a76c2acb | 29 | and the index, again before using the 'commit' command; |
6c96753d | 30 | |
a76c2acb BF |
31 | 3. by listing files as arguments to the 'commit' command, in which |
32 | case the commit will ignore changes staged in the index, and instead | |
6fc4a7e5 MB |
33 | record the current content of the listed files (which must already |
34 | be known to git); | |
6c96753d | 35 | |
a76c2acb BF |
36 | 4. by using the -a switch with the 'commit' command to automatically |
37 | "add" changes from all known files (i.e. all files that are already | |
38 | listed in the index) and to automatically "rm" files in the index | |
39 | that have been removed from the working tree, and then perform the | |
40 | actual commit; | |
6c96753d | 41 | |
6cbf07ef PB |
42 | 5. by using the --interactive switch with the 'commit' command to decide one |
43 | by one which files should be part of the commit, before finalizing the | |
0b444cdb | 44 | operation. Currently, this is done by invoking 'git add --interactive'. |
6cbf07ef | 45 | |
60c2993c | 46 | The `--dry-run` option can be used to obtain a |
6c96753d | 47 | summary of what is included by any of the above for the next |
60c2993c | 48 | commit by giving the same set of parameters (options and paths). |
6c96753d | 49 | |
483bc4f0 | 50 | If you make a commit and then find a mistake immediately after |
0b444cdb | 51 | that, you can recover from it with 'git reset'. |
5bfc4f23 | 52 | |
6d35cc76 | 53 | |
62033318 JH |
54 | OPTIONS |
55 | ------- | |
3240240f SB |
56 | -a:: |
57 | --all:: | |
6c96753d JH |
58 | Tell the command to automatically stage files that have |
59 | been modified and deleted, but new files you have not | |
60 | told git about are not affected. | |
62033318 | 61 | |
3240240f SB |
62 | -C <commit>:: |
63 | --reuse-message=<commit>:: | |
bc47c29e | 64 | Take an existing commit object, and reuse the log message |
62033318 | 65 | and the authorship information (including the timestamp) |
bc47c29e | 66 | when creating the commit. |
62033318 | 67 | |
3240240f SB |
68 | -c <commit>:: |
69 | --reedit-message=<commit>:: | |
bc47c29e SB |
70 | Like '-C', but with '-c' the editor is invoked, so that |
71 | the user can further edit the commit message. | |
72 | ||
d71b8ba7 PN |
73 | --fixup=<commit>:: |
74 | Construct a commit message for use with `rebase --autosquash`. | |
75 | The commit message will be the subject line from the specified | |
76 | commit with a prefix of "fixup! ". See linkgit:git-rebase[1] | |
77 | for details. | |
78 | ||
89ac1223 PN |
79 | --squash=<commit>:: |
80 | Construct a commit message for use with `rebase --autosquash`. | |
81 | The commit message subject line is taken from the specified | |
82 | commit with a prefix of "squash! ". Can be used with additional | |
83 | commit message options (`-m`/`-c`/`-C`/`-F`). See | |
84 | linkgit:git-rebase[1] for details. | |
85 | ||
c51f6cee EM |
86 | --reset-author:: |
87 | When used with -C/-c/--amend options, declare that the | |
88 | authorship of the resulting commit now belongs of the committer. | |
89 | This also renews the author timestamp. | |
90 | ||
7c9f7038 JK |
91 | --short:: |
92 | When doing a dry-run, give the output in the short-format. See | |
93 | linkgit:git-status[1] for details. Implies `--dry-run`. | |
94 | ||
95 | --porcelain:: | |
96 | When doing a dry-run, give the output in a porcelain-ready | |
97 | format. See linkgit:git-status[1] for details. Implies | |
98 | `--dry-run`. | |
99 | ||
100 | -z:: | |
101 | When showing `short` or `porcelain` status output, terminate | |
102 | entries in the status output with NUL, instead of LF. If no | |
103 | format is given, implies the `--porcelain` output format. | |
104 | ||
3240240f SB |
105 | -F <file>:: |
106 | --file=<file>:: | |
62033318 JH |
107 | Take the commit message from the given file. Use '-' to |
108 | read the message from the standard input. | |
109 | ||
c4a7ff52 | 110 | --author=<author>:: |
3334729c JS |
111 | Override the commit author. Specify an explicit author using the |
112 | standard `A U Thor <author@example.com>` format. Otherwise <author> | |
113 | is assumed to be a pattern and is used to search for an existing | |
114 | commit by that author (i.e. rev-list --all -i --author=<author>); | |
115 | the commit author is then copied from the first such commit found. | |
130fcca6 | 116 | |
02b47cd7 MV |
117 | --date=<date>:: |
118 | Override the author date used in the commit. | |
119 | ||
3240240f SB |
120 | -m <msg>:: |
121 | --message=<msg>:: | |
62033318 JH |
122 | Use the given <msg> as the commit message. |
123 | ||
3240240f SB |
124 | -t <file>:: |
125 | --template=<file>:: | |
d1cc130a SG |
126 | Use the contents of the given file as the initial version |
127 | of the commit message. The editor is invoked and you can | |
128 | make subsequent changes. If a message is specified using | |
383e45ce BG |
129 | the `-m` or `-F` options, this option has no effect. This |
130 | overrides the `commit.template` configuration variable. | |
d1cc130a | 131 | |
3240240f SB |
132 | -s:: |
133 | --signoff:: | |
a0178ae2 | 134 | Add Signed-off-by line by the committer at the end of the commit |
09cff066 | 135 | log message. |
3f971fc4 | 136 | |
3240240f SB |
137 | -n:: |
138 | --no-verify:: | |
aa6da6cd | 139 | This option bypasses the pre-commit and commit-msg hooks. |
6998e4db | 140 | See also linkgit:githooks[5]. |
eaa54efc | 141 | |
36863af1 JH |
142 | --allow-empty:: |
143 | Usually recording a commit that has the exact same tree as its | |
17ef10d0 JH |
144 | sole parent commit is a mistake, and the command prevents you |
145 | from making such a commit. This option bypasses the safety, and | |
6b677a28 | 146 | is primarily for use by foreign SCM interface scripts. |
36863af1 | 147 | |
c9b5fde7 ÆAB |
148 | --allow-empty-message:: |
149 | Like --allow-empty this command is primarily for use by foreign | |
6b677a28 | 150 | SCM interface scripts. It allows you to create a commit with an |
c9b5fde7 ÆAB |
151 | empty commit message without using plumbing commands like |
152 | linkgit:git-commit-tree[1]. | |
153 | ||
5f065737 AR |
154 | --cleanup=<mode>:: |
155 | This option sets how the commit message is cleaned up. | |
156 | The '<mode>' can be one of 'verbatim', 'whitespace', 'strip', | |
157 | and 'default'. The 'default' mode will strip leading and | |
158 | trailing empty lines and #commentary from the commit message | |
159 | only if the message is to be edited. Otherwise only whitespace | |
160 | removed. The 'verbatim' mode does not change message at all, | |
161 | 'whitespace' removes just leading/trailing whitespace lines | |
162 | and 'strip' removes both whitespace and commentary. | |
163 | ||
3240240f SB |
164 | -e:: |
165 | --edit:: | |
6d35cc76 JH |
166 | The message taken from file with `-F`, command line with |
167 | `-m`, and from file with `-C` are usually used as the | |
168 | commit log message unmodified. This option lets you | |
169 | further edit the message taken from these sources. | |
170 | ||
ae5d8470 | 171 | --amend:: |
ae5d8470 MR |
172 | Used to amend the tip of the current branch. Prepare the tree |
173 | object you would want to replace the latest commit as usual | |
174 | (this includes the usual -i/-o and explicit paths), and the | |
175 | commit log editor is seeded with the commit message from the | |
176 | tip of the current branch. The commit you create replaces the | |
177 | current tip -- if it was a merge, it will have the parents of | |
178 | the current tip as parents -- so the current top commit is | |
179 | discarded. | |
180 | + | |
6cbd5d7d | 181 | -- |
ae5d8470 | 182 | It is a rough equivalent for: |
6cbd5d7d | 183 | ------ |
ae5d8470 MR |
184 | $ git reset --soft HEAD^ |
185 | $ ... do something else to come up with the right tree ... | |
186 | $ git commit -c ORIG_HEAD | |
6cbd5d7d FD |
187 | |
188 | ------ | |
ae5d8470 | 189 | but can be used to amend a merge commit. |
6cbd5d7d | 190 | -- |
97c33c65 TR |
191 | + |
192 | You should understand the implications of rewriting history if you | |
193 | amend a commit that has already been published. (See the "RECOVERING | |
194 | FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].) | |
ae5d8470 | 195 | |
3240240f SB |
196 | -i:: |
197 | --include:: | |
6c96753d JH |
198 | Before making a commit out of staged contents so far, |
199 | stage the contents of paths given on the command line | |
200 | as well. This is usually not what you want unless you | |
201 | are concluding a conflicted merge. | |
62033318 | 202 | |
3240240f SB |
203 | -o:: |
204 | --only:: | |
d4ba07ca JS |
205 | Make a commit only from the paths specified on the |
206 | command line, disregarding any contents that have been | |
207 | staged so far. This is the default mode of operation of | |
0b444cdb | 208 | 'git commit' if any paths are given on the command line, |
d4ba07ca JS |
209 | in which case this option can be omitted. |
210 | If this option is specified together with '--amend', then | |
04c8ce9c | 211 | no paths need to be specified, which can be used to amend |
d4ba07ca JS |
212 | the last commit without committing changes that have |
213 | already been staged. | |
214 | ||
1947bdbc JH |
215 | -u[<mode>]:: |
216 | --untracked-files[=<mode>]:: | |
4bfee30a MSO |
217 | Show untracked files (Default: 'all'). |
218 | + | |
219 | The mode parameter is optional, and is used to specify | |
e9e92198 JH |
220 | the handling of untracked files. |
221 | + | |
222 | The possible options are: | |
4bfee30a | 223 | + |
6c2ce048 | 224 | - 'no' - Show no untracked files |
4bfee30a MSO |
225 | - 'normal' - Shows untracked files and directories |
226 | - 'all' - Also shows individual files in untracked directories. | |
d6293d1f MSO |
227 | + |
228 | See linkgit:git-config[1] for configuration variable | |
229 | used to change the default for when the option is not | |
230 | specified. | |
af83bed6 | 231 | |
3240240f SB |
232 | -v:: |
233 | --verbose:: | |
af83bed6 JN |
234 | Show unified diff between the HEAD commit and what |
235 | would be committed at the bottom of the commit message | |
236 | template. Note that this diff output doesn't have its | |
237 | lines prefixed with '#'. | |
238 | ||
3240240f SB |
239 | -q:: |
240 | --quiet:: | |
23bfbb81 | 241 | Suppress commit summary message. |
ebd124c6 | 242 | |
3a5d13a3 JH |
243 | --dry-run:: |
244 | Do not create a commit, but show a list of paths that are | |
245 | to be committed, paths with local changes that will be left | |
246 | uncommitted and paths that are untracked. | |
247 | ||
bed575e4 JHI |
248 | --status:: |
249 | Include the output of linkgit:git-status[1] in the commit | |
250 | message template when using an editor to prepare the commit | |
251 | message. Defaults to on, but can be used to override | |
252 | configuration variable commit.status. | |
253 | ||
254 | --no-status:: | |
255 | Do not include the output of linkgit:git-status[1] in the | |
256 | commit message template when using an editor to prepare the | |
257 | default commit message. | |
258 | ||
e994004f | 259 | \--:: |
4170a195 JH |
260 | Do not interpret any more arguments as options. |
261 | ||
262 | <file>...:: | |
6c96753d JH |
263 | When files are given on the command line, the command |
264 | commits the contents of the named files, without | |
265 | recording the changes already staged. The contents of | |
266 | these files are also staged for the next commit on top | |
267 | of what have been staged before. | |
3ae854c3 | 268 | |
788070a2 MV |
269 | :git-commit: 1 |
270 | include::date-formats.txt[] | |
3ae854c3 | 271 | |
6c96753d JH |
272 | EXAMPLES |
273 | -------- | |
274 | When recording your own work, the contents of modified files in | |
275 | your working tree are temporarily stored to a staging area | |
0b444cdb | 276 | called the "index" with 'git add'. A file can be |
97e9a221 | 277 | reverted back, only in the index but not in the working tree, |
b1889c36 | 278 | to that of the last commit with `git reset HEAD -- <file>`, |
0b444cdb | 279 | which effectively reverts 'git add' and prevents the changes to |
97e9a221 JX |
280 | this file from participating in the next commit. After building |
281 | the state to be committed incrementally with these commands, | |
282 | `git commit` (without any pathname parameter) is used to record what | |
6c96753d JH |
283 | has been staged so far. This is the most basic form of the |
284 | command. An example: | |
285 | ||
286 | ------------ | |
287 | $ edit hello.c | |
288 | $ git rm goodbye.c | |
289 | $ git add hello.c | |
290 | $ git commit | |
291 | ------------ | |
292 | ||
6c96753d JH |
293 | Instead of staging files after each individual change, you can |
294 | tell `git commit` to notice the changes to the files whose | |
295 | contents are tracked in | |
296 | your working tree and do corresponding `git add` and `git rm` | |
297 | for you. That is, this example does the same as the earlier | |
298 | example if there is no other change in your working tree: | |
299 | ||
300 | ------------ | |
301 | $ edit hello.c | |
302 | $ rm goodbye.c | |
303 | $ git commit -a | |
304 | ------------ | |
305 | ||
306 | The command `git commit -a` first looks at your working tree, | |
307 | notices that you have modified hello.c and removed goodbye.c, | |
308 | and performs necessary `git add` and `git rm` for you. | |
309 | ||
310 | After staging changes to many files, you can alter the order the | |
311 | changes are recorded in, by giving pathnames to `git commit`. | |
312 | When pathnames are given, the command makes a commit that | |
313 | only records the changes made to the named paths: | |
314 | ||
315 | ------------ | |
316 | $ edit hello.c hello.h | |
317 | $ git add hello.c hello.h | |
318 | $ edit Makefile | |
319 | $ git commit Makefile | |
320 | ------------ | |
321 | ||
322 | This makes a commit that records the modification to `Makefile`. | |
323 | The changes staged for `hello.c` and `hello.h` are not included | |
324 | in the resulting commit. However, their changes are not lost -- | |
325 | they are still staged and merely held back. After the above | |
326 | sequence, if you do: | |
327 | ||
328 | ------------ | |
329 | $ git commit | |
330 | ------------ | |
331 | ||
332 | this second commit would record the changes to `hello.c` and | |
333 | `hello.h` as expected. | |
334 | ||
0b444cdb | 335 | After a merge (initiated by 'git merge' or 'git pull') stops |
483bc4f0 | 336 | because of conflicts, cleanly merged |
6c96753d JH |
337 | paths are already staged to be committed for you, and paths that |
338 | conflicted are left in unmerged state. You would have to first | |
0b444cdb | 339 | check which paths are conflicting with 'git status' |
6c96753d | 340 | and after fixing them manually in your working tree, you would |
0b444cdb | 341 | stage the result as usual with 'git add': |
6c96753d JH |
342 | |
343 | ------------ | |
344 | $ git status | grep unmerged | |
345 | unmerged: hello.c | |
346 | $ edit hello.c | |
347 | $ git add hello.c | |
348 | ------------ | |
349 | ||
350 | After resolving conflicts and staging the result, `git ls-files -u` | |
351 | would stop mentioning the conflicted path. When you are done, | |
352 | run `git commit` to finally record the merge: | |
353 | ||
354 | ------------ | |
355 | $ git commit | |
356 | ------------ | |
357 | ||
358 | As with the case to record your own changes, you can use `-a` | |
359 | option to save typing. One difference is that during a merge | |
360 | resolution, you cannot use `git commit` with pathnames to | |
361 | alter the order the changes are committed, because the merge | |
362 | should be recorded as a single commit. In fact, the command | |
363 | refuses to run when given pathnames (but see `-i` option). | |
364 | ||
365 | ||
5dc7bcc2 JH |
366 | DISCUSSION |
367 | ---------- | |
368 | ||
936f32d3 JH |
369 | Though not required, it's a good idea to begin the commit message |
370 | with a single short (less than 50 character) line summarizing the | |
371 | change, followed by a blank line and then a more thorough description. | |
372 | Tools that turn commits into email, for example, use the first line | |
373 | on the Subject: line and the rest of the commit in the body. | |
374 | ||
5dc7bcc2 JH |
375 | include::i18n.txt[] |
376 | ||
ef0c2abf AR |
377 | ENVIRONMENT AND CONFIGURATION VARIABLES |
378 | --------------------------------------- | |
379 | The editor used to edit the commit log message will be chosen from the | |
380 | GIT_EDITOR environment variable, the core.editor configuration variable, the | |
381 | VISUAL environment variable, or the EDITOR environment variable (in that | |
b4479f07 | 382 | order). See linkgit:git-var[1] for details. |
6c96753d JH |
383 | |
384 | HOOKS | |
385 | ----- | |
8089c85b | 386 | This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, |
6998e4db | 387 | and `post-commit` hooks. See linkgit:githooks[5] for more |
6c96753d | 388 | information. |
130fcca6 | 389 | |
130fcca6 | 390 | |
6c96753d JH |
391 | SEE ALSO |
392 | -------- | |
5162e697 DM |
393 | linkgit:git-add[1], |
394 | linkgit:git-rm[1], | |
395 | linkgit:git-mv[1], | |
396 | linkgit:git-merge[1], | |
397 | linkgit:git-commit-tree[1] | |
130fcca6 | 398 | |
62033318 JH |
399 | Author |
400 | ------ | |
3f971fc4 | 401 | Written by Linus Torvalds <torvalds@osdl.org> and |
59eb68aa | 402 | Junio C Hamano <gitster@pobox.com> |
3f971fc4 | 403 | |
62033318 JH |
404 | |
405 | GIT | |
406 | --- | |
9e1f0a85 | 407 | Part of the linkgit:git[1] suite |