blob: 0a7365b9a80ed0d134bccb3fbe4baacc59056423 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:231git-commit(1)
2=============
3
4NAME
5----
6git-commit - Record your changes
7
8SYNOPSIS
9--------
Junio C Hamano235a91e2006-01-07 01:13:5810[verse]
Junio C Hamano6697ac52006-02-14 08:00:2311'git-commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>]
Junio C Hamanobfe9e752006-04-05 21:43:2812 [--no-verify] [--amend] [-e] [--author <author>]
13 [--] [[-i | -o ]<file>...]
Junio C Hamano1a4e8412005-12-27 08:17:2314
15DESCRIPTION
16-----------
17Updates the index file for given paths, or all modified files if
18'-a' is specified, and makes a commit object. The command
19VISUAL and EDITOR environment variables to edit the commit log
20message.
21
Junio C Hamano2b135272006-03-18 07:45:4222Several environment variable are used during commits. They are
23documented in gitlink:git-commit-tree[1].
24
25
Junio C Hamano1a4e8412005-12-27 08:17:2326This command can run `commit-msg`, `pre-commit`, and
27`post-commit` hooks. See link:hooks.html[hooks] for more
28information.
29
30OPTIONS
31-------
32-a|--all::
Junio C Hamano74e8a2d2006-01-14 03:58:4133Update all paths in the index file. This flag notices
34files that have been modified and deleted, but new files
Junio C Hamanoa6331a82006-01-22 07:50:3335you have not told git about are not affected.
Junio C Hamano1a4e8412005-12-27 08:17:2336
37-c or -C <commit>::
38Take existing commit object, and reuse the log message
39and the authorship information (including the timestamp)
40when creating the commit. With '-C', the editor is not
41invoked; with '-c' the user can further edit the commit
42message.
43
44-F <file>::
45Take the commit message from the given file. Use '-' to
46read the message from the standard input.
47
Junio C Hamano40f2f8d2006-02-07 08:04:3948--author <author>::
49Override the author name used in the commit. Use
50`A U Thor <author@example.com>` format.
51
Junio C Hamano1a4e8412005-12-27 08:17:2352-m <msg>::
53Use the given <msg> as the commit message.
54
55-s|--signoff::
56Add Signed-off-by line at the end of the commit message.
57
58-v|--verify::
59Look for suspicious lines the commit introduces, and
60abort committing if there is one. The definition of
61'suspicious lines' is currently the lines that has
62trailing whitespaces, and the lines whose indentation
63has a SP character immediately followed by a TAB
64character. This is the default.
65
66-n|--no-verify::
67The opposite of `--verify`.
68
69-e|--edit::
70The message taken from file with `-F`, command line with
71`-m`, and from file with `-C` are usually used as the
72commit log message unmodified. This option lets you
73further edit the message taken from these sources.
74
Junio C Hamanobfe9e752006-04-05 21:43:2875--amend::
76
77Used to amend the tip of the current branch. Prepare the tree
78object you would want to replace the latest commit as usual
79(this includes the usual -i/-o and explicit paths), and the
80commit log editor is seeded with the commit message from the
81tip of the current branch. The commit you create replaces the
82current tip -- if it was a merge, it will have the parents of
83the current tip as parents -- so the current top commit is
84discarded.
85+
Junio C Hamano47ea30e2006-04-05 23:08:0386--
Junio C Hamanobfe9e752006-04-05 21:43:2887It is a rough equivalent for:
Junio C Hamano47ea30e2006-04-05 23:08:0388------
Junio C Hamanobfe9e752006-04-05 21:43:2889$ git reset --soft HEAD^
90$ ... do something else to come up with the right tree ...
91$ git commit -c ORIG_HEAD
Junio C Hamano47ea30e2006-04-05 23:08:0392
93------
Junio C Hamanobfe9e752006-04-05 21:43:2894but can be used to amend a merge commit.
Junio C Hamano47ea30e2006-04-05 23:08:0395--
Junio C Hamanobfe9e752006-04-05 21:43:2896
Junio C Hamano40f2f8d2006-02-07 08:04:3997-i|--include::
98Instead of committing only the files specified on the
99command line, update them in the index file and then
100commit the whole index. This is the traditional
101behaviour.
102
Junio C Hamano6697ac52006-02-14 08:00:23103-o|--only::
Junio C Hamano40f2f8d2006-02-07 08:04:39104Commit only the files specified on the command line.
105This format cannot be used during a merge, nor when the
106index and the latest commit does not match on the
107specified paths to avoid confusion.
Junio C Hamano1a4e8412005-12-27 08:17:23108
Junio C Hamano6697ac52006-02-14 08:00:23109--::
110Do not interpret any more arguments as options.
111
112<file>...::
113Files to be committed. The meaning of these is
114different between `--include` and `--only`. Without
115either, it defaults `--only` semantics.
116
Junio C Hamano1a4e8412005-12-27 08:17:23117If you make a commit and then found a mistake immediately after
118that, you can recover from it with gitlink:git-reset[1].
119
120
Junio C Hamano40f2f8d2006-02-07 08:04:39121Discussion
122----------
123
124`git commit` without _any_ parameter commits the tree structure
125recorded by the current index file. This is a whole-tree commit
126even the command is invoked from a subdirectory.
127
128`git commit --include paths...` is equivalent to
129
130git update-index --remove paths...
131git commit
132
133That is, update the specified paths to the index and then commit
134the whole tree.
135
136`git commit paths...` largely bypasses the index file and
137commits only the changes made to the specified paths. It has
138however several safety valves to prevent confusion.
139
140. It refuses to run during a merge (i.e. when
141 `$GIT_DIR/MERGE_HEAD` exists), and reminds trained git users
142 that the traditional semantics now needs -i flag.
143
144. It refuses to run if named `paths...` are different in HEAD
145 and the index (ditto about reminding). Added paths are OK.
146 This is because an earlier `git diff` (not `git diff HEAD`)
147 would have shown the differences since the last `git
148 update-index paths...` to the user, and an inexperienced user
149 may mistakenly think that the changes between the index and
150 the HEAD (i.e. earlier changes made before the last `git
151 update-index paths...` was done) are not being committed.
152
153. It reads HEAD commit into a temporary index file, updates the
154 specified `paths...` and makes a commit. At the same time,
155 the real index file is also updated with the same `paths...`.
156
157`git commit --all` updates the index file with _all_ changes to
158the working tree, and makes a whole-tree commit, regardless of
159which subdirectory the command is invoked in.
160
161
Junio C Hamano1a4e8412005-12-27 08:17:23162Author
163------
164Written by Linus Torvalds <torvalds@osdl.org> and
165Junio C Hamano <junkio@cox.net>
166
167
168GIT
169---
170Part of the gitlink:git[7] suite