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