blob: e93e606f458356275964d0d7b438ca772abba47c [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:231git-add(1)
2==========
3
4NAME
5----
Junio C Hamano4cd1c0e2007-08-06 04:39:146git-add - Add file contents to the index
Junio C Hamano1a4e8412005-12-27 08:17:237
8SYNOPSIS
9--------
Junio C Hamano8b8b0f22007-08-26 22:10:2610[verse]
Junio C Hamanofce7c7e2008-07-02 03:06:3811'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
Junio C Hamano52ba2952009-05-18 17:43:0212 [--edit | -e] [--all | [--update | -u]] [--intent-to-add | -N]
Junio C Hamano27a128b2009-08-13 01:23:0013 [--refresh] [--ignore-errors] [--] [<filepattern>...]
Junio C Hamano1a4e8412005-12-27 08:17:2314
15DESCRIPTION
16-----------
Junio C Hamano4cd1c0e2007-08-06 04:39:1417This command adds the current content of new or modified files to the
18index, thus staging that content for inclusion in the next commit.
Junio C Hamano1a4e8412005-12-27 08:17:2319
Junio C Hamano4cd1c0e2007-08-06 04:39:1420The "index" holds a snapshot of the content of the working tree, and it
21is this snapshot that is taken as the contents of the next commit. Thus
22after making any changes to the working directory, and before running
23the commit command, you must use the 'add' command to add any new or
24modified files to the index.
Junio C Hamanoe7935c42006-12-13 21:32:1725
Junio C Hamano4cd1c0e2007-08-06 04:39:1426This command can be performed multiple times before a commit. It only
27adds the content of the specified file(s) at the time the add command is
28run; if you want subsequent changes included in the next commit, then
29you must run 'git add' again to add the new content to the index.
Junio C Hamanoe7935c42006-12-13 21:32:1730
Junio C Hamano4cd1c0e2007-08-06 04:39:1431The 'git status' command can be used to obtain a summary of which
32files have changes that are staged for the next commit.
33
Junio C Hamano3c1f2c72007-08-17 07:48:0534The 'git add' command will not add ignored files by default. If any
35ignored files were explicitly specified on the command line, 'git add'
36will fail with a list of ignored files. Ignored files reached by
Junio C Hamano7d9e9bd2007-08-29 07:31:4737directory recursion or filename globbing performed by Git (quote your
38globs before the shell) will be silently ignored. The 'add' command can
39be used to add ignored files with the `-f` (force) option.
Junio C Hamano1a4e8412005-12-27 08:17:2340
Junio C Hamano35738e82008-01-07 07:55:4641Please see linkgit:git-commit[1] for alternative ways to add content to a
Junio C Hamanoe7935c42006-12-13 21:32:1742commit.
43
44
Junio C Hamano1a4e8412005-12-27 08:17:2345OPTIONS
46-------
Junio C Hamano8b8b0f22007-08-26 22:10:2647<filepattern>...::
Junio C Hamano3d2adc72006-12-26 03:21:4548Files to add content from. Fileglobs (e.g. `*.c`) can
49be given to add all matching files. Also a
50leading directory name (e.g. `dir` to add `dir/file1`
51and `dir/file2`) can be given to add all files in the
52directory, recursively.
Junio C Hamano1a4e8412005-12-27 08:17:2353
Junio C Hamanoeb415992008-06-08 22:49:4754-n::
55--dry-run::
Junio C Hamano1a4e8412005-12-27 08:17:2356 Don't actually add the file(s), just show if they exist.
57
Junio C Hamanoeb415992008-06-08 22:49:4758-v::
59--verbose::
Junio C Hamano1a4e8412005-12-27 08:17:2360 Be verbose.
61
Junio C Hamano3d2adc72006-12-26 03:21:4562-f::
Junio C Hamano00e884a2008-06-15 05:10:3863--force::
Junio C Hamano3d2adc72006-12-26 03:21:4564Allow adding otherwise ignored files.
65
Junio C Hamanoeb415992008-06-08 22:49:4766-i::
67--interactive::
Junio C Hamano17bbaca2006-12-25 11:36:3168Add modified contents in the working tree interactively to
Junio C Hamanoe0facb92007-12-05 10:59:4869the index. Optional path arguments may be supplied to limit
70operation to a subset of the working tree. See ``Interactive
71mode'' for details.
72
Junio C Hamanoeb415992008-06-08 22:49:4773-p::
74--patch::
Junio C Hamano7df6dcf2009-09-13 09:51:1775Interactively choose hunks of patch between the index and the
76work tree and add them to the index. This gives the user a chance
77to review the difference before adding modified contents to the
78index.
Junio C Hamanoe1b26832009-11-15 10:02:5679+
80This effectively runs `add --interactive`, but bypasses the
81initial command menu and directly jumps to the `patch` subcommand.
82See ``Interactive mode'' for details.
Junio C Hamano17bbaca2006-12-25 11:36:3183
Junio C Hamano52ba2952009-05-18 17:43:0284-e, \--edit::
85Open the diff vs. the index in an editor and let the user
86edit it. After the editor was closed, adjust the hunk headers
87and apply the patch to the index.
88+
89*NOTE*: Obviously, if you change anything else than the first character
90on lines beginning with a space or a minus, the patch will no longer
91apply.
92
Junio C Hamano3d30fd52007-05-08 00:32:5393-u::
Junio C Hamano00e884a2008-06-15 05:10:3894--update::
Junio C Hamano6d76d612008-05-09 05:46:0895Update only files that git already knows about, staging modified
96content for commit and marking deleted files for removal. This
97is similar
Junio C Hamano0430e3a2007-05-15 03:13:1798to what "git commit -a" does in preparation for making a commit,
99except that the update is limited to paths specified on the
Junio C Hamano83d46a22008-02-21 02:29:42100command line. If no paths are specified, all tracked files in the
101current directory and its subdirectories are updated.
Junio C Hamano3d30fd52007-05-08 00:32:53102
Junio C Hamano5ba2c222008-07-21 04:33:46103-A::
104--all::
105Update files that git already knows about (same as '\--update')
106and add all untracked files that are not ignored by '.gitignore'
107mechanism.
108
Junio C Hamano845880c2008-10-21 19:04:45109
110-N::
111--intent-to-add::
112Record only the fact that the path will be added later. An entry
113for the path is placed in the index with no content. This is
114useful for, among other things, showing the unstaged content of
Junio C Hamano610d1762008-11-28 06:27:13115such files with 'git diff' and committing them with 'git commit
Junio C Hamano845880c2008-10-21 19:04:45116-a'.
117
Junio C Hamanoeb415992008-06-08 22:49:47118--refresh::
Junio C Hamano024b6c62007-08-14 09:43:08119Don't add the file(s), but only refresh their stat()
120information in the index.
121
Junio C Hamanoeb415992008-06-08 22:49:47122--ignore-errors::
Junio C Hamanofeeb1be2008-05-22 00:53:35123If some files could not be added because of errors indexing
124them, do not abort the operation, but continue adding the
125others. The command shall still exit with non-zero status.
126
Junio C Hamano1bb569e2006-05-05 23:14:25127\--::
Junio C Hamano7e9f6b72006-02-22 10:44:55128This option can be used to separate command-line options from
129the list of files, (useful when filenames might be mistaken
130for command-line options).
131
Junio C Hamano1a4e8412005-12-27 08:17:23132
Junio C Hamano9fbd4f72007-05-18 15:54:37133Configuration
134-------------
135
136The optional configuration variable 'core.excludesfile' indicates a path to a
137file containing patterns of file names to exclude from git-add, similar to
138$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
Junio C Hamanofce7c7e2008-07-02 03:06:38139those in info/exclude. See linkgit:gitrepository-layout[5].
Junio C Hamano9fbd4f72007-05-18 15:54:37140
141
Junio C Hamano1a4e8412005-12-27 08:17:23142EXAMPLES
143--------
Junio C Hamano1a4e8412005-12-27 08:17:23144
Junio C Hamano6d76d612008-05-09 05:46:08145* Adds content from all `\*.txt` files under `Documentation` directory
146and its subdirectories:
147+
148------------
149$ git add Documentation/\\*.txt
150------------
Junio C Hamano1a4e8412005-12-27 08:17:23151+
152Note that the asterisk `\*` is quoted from the shell in this
Junio C Hamanof8a79222009-03-01 08:02:50153example; this lets the command include the files from
Junio C Hamano1a4e8412005-12-27 08:17:23154subdirectories of `Documentation/` directory.
155
Junio C Hamano6d76d612008-05-09 05:46:08156* Considers adding content from all git-*.sh scripts:
157+
158------------
159$ git add git-*.sh
160------------
161+
Junio C Hamanof8a79222009-03-01 08:02:50162Because this example lets the shell expand the asterisk (i.e. you are
Junio C Hamano6d76d612008-05-09 05:46:08163listing the files explicitly), it does not consider
164`subdir/git-foo.sh`.
Junio C Hamano1a4e8412005-12-27 08:17:23165
Junio C Hamano17bbaca2006-12-25 11:36:31166Interactive mode
167----------------
168When the command enters the interactive mode, it shows the
Junio C Hamanof9771f62007-01-17 17:42:30169output of the 'status' subcommand, and then goes into its
Junio C Hamano17bbaca2006-12-25 11:36:31170interactive command loop.
171
172The command loop shows the list of subcommands available, and
173gives a prompt "What now> ". In general, when the prompt ends
174with a single '>', you can pick only one of the choices given
175and type return, like this:
176
177------------
178 *** Commands ***
179 1: status 2: update 3: revert 4: add untracked
180 5: patch 6: diff 7: quit 8: help
181 What now> 1
182------------
183
184You also could say "s" or "sta" or "status" above as long as the
185choice is unique.
186
187The main command loop has 6 subcommands (plus help and quit).
188
189status::
190
191 This shows the change between HEAD and index (i.e. what will be
192 committed if you say "git commit"), and between index and
193 working tree files (i.e. what you could stage further before
194 "git commit" using "git-add") for each path. A sample output
195 looks like this:
196+
197------------
198 staged unstaged path
199 1: binary nothing foo.png
200 2: +403/-35 +1/-1 git-add--interactive.perl
201------------
202+
203It shows that foo.png has differences from HEAD (but that is
204binary so line count cannot be shown) and there is no
205difference between indexed copy and the working tree
206version (if the working tree version were also different,
207'binary' would have been shown in place of 'nothing'). The
208other file, git-add--interactive.perl, has 403 lines added
209and 35 lines deleted if you commit what is in the index, but
210working tree file has further modifications (one addition and
211one deletion).
212
213update::
214
Junio C Hamanof8a79222009-03-01 08:02:50215 This shows the status information and issues an "Update>>"
216 prompt. When the prompt ends with double '>>', you can
Junio C Hamano17bbaca2006-12-25 11:36:31217 make more than one selection, concatenated with whitespace or
218 comma. Also you can say ranges. E.g. "2-5 7,9" to choose
Junio C Hamano38ddcce2008-07-15 15:49:03219 2,3,4,5,7,9 from the list. If the second number in a range is
220 omitted, all remaining patches are taken. E.g. "7-" to choose
221 7,8,9 from the list. You can say '*' to choose everything.
Junio C Hamano17bbaca2006-12-25 11:36:31222+
223What you chose are then highlighted with '*',
224like this:
225+
226------------
227 staged unstaged path
228 1: binary nothing foo.png
229* 2: +403/-35 +1/-1 git-add--interactive.perl
230------------
231+
232To remove selection, prefix the input with `-`
233like this:
234+
235------------
236Update>> -2
237------------
238+
239After making the selection, answer with an empty line to stage the
240contents of working tree files for selected paths in the index.
241
242revert::
243
244 This has a very similar UI to 'update', and the staged
245 information for selected paths are reverted to that of the
246 HEAD version. Reverting new paths makes them untracked.
247
248add untracked::
249
250 This has a very similar UI to 'update' and
251 'revert', and lets you add untracked paths to the index.
252
253patch::
254
Junio C Hamanof8a79222009-03-01 08:02:50255 This lets you choose one path out of a 'status' like selection.
256 After choosing the path, it presents the diff between the index
Junio C Hamano17bbaca2006-12-25 11:36:31257 and the working tree file and asks you if you want to stage
258 the change of each hunk. You can say:
259
Junio C Hamano8760ea62008-03-14 08:58:45260 y - stage this hunk
261 n - do not stage this hunk
Junio C Hamano3bd66e92009-04-18 06:17:56262 q - quit, do not stage this hunk nor any of the remaining ones
Junio C Hamano8760ea62008-03-14 08:58:45263 a - stage this and all the remaining hunks in the file
264 d - do not stage this hunk nor any of the remaining hunks in the file
Junio C Hamano3bd66e92009-04-18 06:17:56265 g - select a hunk to go to
266 / - search for a hunk matching the given regex
Junio C Hamano8760ea62008-03-14 08:58:45267 j - leave this hunk undecided, see next undecided hunk
268 J - leave this hunk undecided, see next hunk
269 k - leave this hunk undecided, see previous undecided hunk
270 K - leave this hunk undecided, see previous hunk
Junio C Hamanoe0facb92007-12-05 10:59:48271 s - split the current hunk into smaller hunks
Junio C Hamano46a38aa2008-07-14 03:13:27272 e - manually edit the current hunk
Junio C Hamanoe0facb92007-12-05 10:59:48273 ? - print help
Junio C Hamano17bbaca2006-12-25 11:36:31274+
275After deciding the fate for all hunks, if there is any hunk
276that was chosen, the index is updated with the selected hunks.
277
278diff::
279
280 This lets you review what will be committed (i.e. between
281 HEAD and index).
282
Junio C Hamano9049d912008-05-29 02:09:50283SEE ALSO
Junio C Hamano2bb13102006-03-06 07:10:21284--------
Junio C Hamano35738e82008-01-07 07:55:46285linkgit:git-status[1]
286linkgit:git-rm[1]
287linkgit:git-reset[1]
288linkgit:git-mv[1]
289linkgit:git-commit[1]
290linkgit:git-update-index[1]
Junio C Hamano1a4e8412005-12-27 08:17:23291
292Author
293------
294Written by Linus Torvalds <torvalds@osdl.org>
295
296Documentation
297--------------
298Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
299
300GIT
301---
Junio C Hamanof7c042d2008-06-06 22:50:53302Part of the linkgit:git[1] suite