blob: 73378b2bef8405f54c661e8c9745057b5b243f4d [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 Hamanoafabd322010-07-19 20:26:1513 [--refresh] [--ignore-errors] [--ignore-missing] [--]
14 [<filepattern>...]
Junio C Hamano1a4e8412005-12-27 08:17:2315
16DESCRIPTION
17-----------
Junio C Hamanoae05fee2010-01-08 07:39:4618This command updates the index using the current content found in
19the working tree, to prepare the content staged for the next commit.
20It typically adds the current content of existing paths as a whole,
21but with some options it can also be used to add content with
22only part of the changes made to the working tree files applied, or
23remove paths that do not exist in the working tree anymore.
Junio C Hamano1a4e8412005-12-27 08:17:2324
Junio C Hamano4cd1c0e2007-08-06 04:39:1425The "index" holds a snapshot of the content of the working tree, and it
26is this snapshot that is taken as the contents of the next commit. Thus
27after making any changes to the working directory, and before running
Junio C Hamanoae05fee2010-01-08 07:39:4628the commit command, you must use the `add` command to add any new or
Junio C Hamano4cd1c0e2007-08-06 04:39:1429modified files to the index.
Junio C Hamanoe7935c42006-12-13 21:32:1730
Junio C Hamano4cd1c0e2007-08-06 04:39:1431This command can be performed multiple times before a commit. It only
32adds the content of the specified file(s) at the time the add command is
33run; if you want subsequent changes included in the next commit, then
Junio C Hamanoae05fee2010-01-08 07:39:4634you must run `git add` again to add the new content to the index.
Junio C Hamanoe7935c42006-12-13 21:32:1735
Junio C Hamanoae05fee2010-01-08 07:39:4636The `git status` command can be used to obtain a summary of which
Junio C Hamano4cd1c0e2007-08-06 04:39:1437files have changes that are staged for the next commit.
38
Junio C Hamanoae05fee2010-01-08 07:39:4639The `git add` command will not add ignored files by default. If any
40ignored files were explicitly specified on the command line, `git add`
Junio C Hamano3c1f2c72007-08-17 07:48:0541will fail with a list of ignored files. Ignored files reached by
Junio C Hamano7d9e9bd2007-08-29 07:31:4742directory recursion or filename globbing performed by Git (quote your
Junio C Hamano1aa40d22010-01-21 17:46:4343globs before the shell) will be silently ignored. The 'git add' command can
Junio C Hamano7d9e9bd2007-08-29 07:31:4744be used to add ignored files with the `-f` (force) option.
Junio C Hamano1a4e8412005-12-27 08:17:2345
Junio C Hamano35738e82008-01-07 07:55:4646Please see linkgit:git-commit[1] for alternative ways to add content to a
Junio C Hamanoe7935c42006-12-13 21:32:1747commit.
48
49
Junio C Hamano1a4e8412005-12-27 08:17:2350OPTIONS
51-------
Junio C Hamano8b8b0f22007-08-26 22:10:2652<filepattern>...::
Junio C Hamano3d2adc72006-12-26 03:21:4553Files to add content from. Fileglobs (e.g. `*.c`) can
54be given to add all matching files. Also a
55leading directory name (e.g. `dir` to add `dir/file1`
56and `dir/file2`) can be given to add all files in the
57directory, recursively.
Junio C Hamano1a4e8412005-12-27 08:17:2358
Junio C Hamanoeb415992008-06-08 22:49:4759-n::
60--dry-run::
Junio C Hamanoafabd322010-07-19 20:26:1561Don't actually add the file(s), just show if they exist and/or will
62be ignored.
Junio C Hamano1a4e8412005-12-27 08:17:2363
Junio C Hamanoeb415992008-06-08 22:49:4764-v::
65--verbose::
Junio C Hamano1a4e8412005-12-27 08:17:2366 Be verbose.
67
Junio C Hamano3d2adc72006-12-26 03:21:4568-f::
Junio C Hamano00e884a2008-06-15 05:10:3869--force::
Junio C Hamano3d2adc72006-12-26 03:21:4570Allow adding otherwise ignored files.
71
Junio C Hamanoeb415992008-06-08 22:49:4772-i::
73--interactive::
Junio C Hamano17bbaca2006-12-25 11:36:3174Add modified contents in the working tree interactively to
Junio C Hamanoe0facb92007-12-05 10:59:4875the index. Optional path arguments may be supplied to limit
76operation to a subset of the working tree. See ``Interactive
77mode'' for details.
78
Junio C Hamanoeb415992008-06-08 22:49:4779-p::
80--patch::
Junio C Hamano7df6dcf2009-09-13 09:51:1781Interactively choose hunks of patch between the index and the
82work tree and add them to the index. This gives the user a chance
83to review the difference before adding modified contents to the
84index.
Junio C Hamanoe1b26832009-11-15 10:02:5685+
86This effectively runs `add --interactive`, but bypasses the
87initial command menu and directly jumps to the `patch` subcommand.
88See ``Interactive mode'' for details.
Junio C Hamano17bbaca2006-12-25 11:36:3189
Junio C Hamano52ba2952009-05-18 17:43:0290-e, \--edit::
91Open the diff vs. the index in an editor and let the user
92edit it. After the editor was closed, adjust the hunk headers
93and apply the patch to the index.
94+
95*NOTE*: Obviously, if you change anything else than the first character
96on lines beginning with a space or a minus, the patch will no longer
97apply.
98
Junio C Hamano3d30fd52007-05-08 00:32:5399-u::
Junio C Hamano00e884a2008-06-15 05:10:38100--update::
Junio C Hamanoae05fee2010-01-08 07:39:46101Only match <filepattern> against already tracked files in
102the index rather than the working tree. That means that it
103will never stage new files, but that it will stage modified
104new contents of tracked files and that it will remove files
105from the index if the corresponding files in the working tree
106have been removed.
107+
108If no <filepattern> is given, default to "."; in other words,
109update all tracked files in the current directory and its
110subdirectories.
Junio C Hamano3d30fd52007-05-08 00:32:53111
Junio C Hamano5ba2c222008-07-21 04:33:46112-A::
113--all::
Junio C Hamanoae05fee2010-01-08 07:39:46114Like `-u`, but match <filepattern> against files in the
115working tree in addition to the index. That means that it
116will find new files as well as staging modified content and
117removing files that are no longer in the working tree.
Junio C Hamano845880c2008-10-21 19:04:45118
119-N::
120--intent-to-add::
121Record only the fact that the path will be added later. An entry
122for the path is placed in the index with no content. This is
123useful for, among other things, showing the unstaged content of
Junio C Hamanoae05fee2010-01-08 07:39:46124such files with `git diff` and committing them with `git commit
125-a`.
Junio C Hamano845880c2008-10-21 19:04:45126
Junio C Hamanoeb415992008-06-08 22:49:47127--refresh::
Junio C Hamano024b6c62007-08-14 09:43:08128Don't add the file(s), but only refresh their stat()
129information in the index.
130
Junio C Hamanoeb415992008-06-08 22:49:47131--ignore-errors::
Junio C Hamanofeeb1be2008-05-22 00:53:35132If some files could not be added because of errors indexing
133them, do not abort the operation, but continue adding the
134others. The command shall still exit with non-zero status.
135
Junio C Hamanoafabd322010-07-19 20:26:15136--ignore-missing::
137This option can only be used together with --dry-run. By using
138this option the user can check if any of the given files would
139be ignored, no matter if they are already present in the work
140tree or not.
141
Junio C Hamano1bb569e2006-05-05 23:14:25142\--::
Junio C Hamano7e9f6b72006-02-22 10:44:55143This option can be used to separate command-line options from
144the list of files, (useful when filenames might be mistaken
145for command-line options).
146
Junio C Hamano1a4e8412005-12-27 08:17:23147
Junio C Hamano9fbd4f72007-05-18 15:54:37148Configuration
149-------------
150
Junio C Hamanoae05fee2010-01-08 07:39:46151The optional configuration variable `core.excludesfile` indicates a path to a
Junio C Hamano9fbd4f72007-05-18 15:54:37152file containing patterns of file names to exclude from git-add, similar to
153$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
Junio C Hamanofce7c7e2008-07-02 03:06:38154those in info/exclude. See linkgit:gitrepository-layout[5].
Junio C Hamano9fbd4f72007-05-18 15:54:37155
156
Junio C Hamano1a4e8412005-12-27 08:17:23157EXAMPLES
158--------
Junio C Hamano1a4e8412005-12-27 08:17:23159
Junio C Hamano2db3e752010-09-03 21:33:06160* Adds content from all `*.txt` files under `Documentation` directory
Junio C Hamano6d76d612008-05-09 05:46:08161and its subdirectories:
162+
163------------
Junio C Hamano78b92a82010-02-09 07:34:13164$ git add Documentation/\*.txt
Junio C Hamano6d76d612008-05-09 05:46:08165------------
Junio C Hamano1a4e8412005-12-27 08:17:23166+
Junio C Hamano2db3e752010-09-03 21:33:06167Note that the asterisk `*` is quoted from the shell in this
Junio C Hamanof8a79222009-03-01 08:02:50168example; this lets the command include the files from
Junio C Hamano1a4e8412005-12-27 08:17:23169subdirectories of `Documentation/` directory.
170
Junio C Hamano6d76d612008-05-09 05:46:08171* Considers adding content from all git-*.sh scripts:
172+
173------------
174$ git add git-*.sh
175------------
176+
Junio C Hamanof8a79222009-03-01 08:02:50177Because this example lets the shell expand the asterisk (i.e. you are
Junio C Hamano6d76d612008-05-09 05:46:08178listing the files explicitly), it does not consider
179`subdir/git-foo.sh`.
Junio C Hamano1a4e8412005-12-27 08:17:23180
Junio C Hamano17bbaca2006-12-25 11:36:31181Interactive mode
182----------------
183When the command enters the interactive mode, it shows the
Junio C Hamanof9771f62007-01-17 17:42:30184output of the 'status' subcommand, and then goes into its
Junio C Hamano17bbaca2006-12-25 11:36:31185interactive command loop.
186
187The command loop shows the list of subcommands available, and
188gives a prompt "What now> ". In general, when the prompt ends
189with a single '>', you can pick only one of the choices given
190and type return, like this:
191
192------------
193 *** Commands ***
194 1: status 2: update 3: revert 4: add untracked
195 5: patch 6: diff 7: quit 8: help
196 What now> 1
197------------
198
Junio C Hamanoae05fee2010-01-08 07:39:46199You also could say `s` or `sta` or `status` above as long as the
Junio C Hamano17bbaca2006-12-25 11:36:31200choice is unique.
201
202The main command loop has 6 subcommands (plus help and quit).
203
204status::
205
206 This shows the change between HEAD and index (i.e. what will be
Junio C Hamanoae05fee2010-01-08 07:39:46207 committed if you say `git commit`), and between index and
Junio C Hamano17bbaca2006-12-25 11:36:31208 working tree files (i.e. what you could stage further before
Junio C Hamanoae05fee2010-01-08 07:39:46209 `git commit` using `git add`) for each path. A sample output
Junio C Hamano17bbaca2006-12-25 11:36:31210 looks like this:
211+
212------------
213 staged unstaged path
214 1: binary nothing foo.png
215 2: +403/-35 +1/-1 git-add--interactive.perl
216------------
217+
218It shows that foo.png has differences from HEAD (but that is
219binary so line count cannot be shown) and there is no
220difference between indexed copy and the working tree
221version (if the working tree version were also different,
222'binary' would have been shown in place of 'nothing'). The
Junio C Hamano2db3e752010-09-03 21:33:06223other file, git-add{litdd}interactive.perl, has 403 lines added
Junio C Hamano17bbaca2006-12-25 11:36:31224and 35 lines deleted if you commit what is in the index, but
225working tree file has further modifications (one addition and
226one deletion).
227
228update::
229
Junio C Hamanof8a79222009-03-01 08:02:50230 This shows the status information and issues an "Update>>"
231 prompt. When the prompt ends with double '>>', you can
Junio C Hamano17bbaca2006-12-25 11:36:31232 make more than one selection, concatenated with whitespace or
233 comma. Also you can say ranges. E.g. "2-5 7,9" to choose
Junio C Hamano38ddcce2008-07-15 15:49:03234 2,3,4,5,7,9 from the list. If the second number in a range is
235 omitted, all remaining patches are taken. E.g. "7-" to choose
236 7,8,9 from the list. You can say '*' to choose everything.
Junio C Hamano17bbaca2006-12-25 11:36:31237+
238What you chose are then highlighted with '*',
239like this:
240+
241------------
242 staged unstaged path
243 1: binary nothing foo.png
244* 2: +403/-35 +1/-1 git-add--interactive.perl
245------------
246+
247To remove selection, prefix the input with `-`
248like this:
249+
250------------
251Update>> -2
252------------
253+
254After making the selection, answer with an empty line to stage the
255contents of working tree files for selected paths in the index.
256
257revert::
258
259 This has a very similar UI to 'update', and the staged
260 information for selected paths are reverted to that of the
261 HEAD version. Reverting new paths makes them untracked.
262
263add untracked::
264
265 This has a very similar UI to 'update' and
266 'revert', and lets you add untracked paths to the index.
267
268patch::
269
Junio C Hamanof8a79222009-03-01 08:02:50270 This lets you choose one path out of a 'status' like selection.
271 After choosing the path, it presents the diff between the index
Junio C Hamano17bbaca2006-12-25 11:36:31272 and the working tree file and asks you if you want to stage
273 the change of each hunk. You can say:
274
Junio C Hamano8760ea62008-03-14 08:58:45275 y - stage this hunk
276 n - do not stage this hunk
Junio C Hamanoa574a092010-06-13 19:57:10277 q - quit; do not stage this hunk nor any of the remaining ones
278 a - stage this hunk and all later hunks in the file
279 d - do not stage this hunk nor any of the later hunks in the file
Junio C Hamano3bd66e92009-04-18 06:17:56280 g - select a hunk to go to
281 / - search for a hunk matching the given regex
Junio C Hamano8760ea62008-03-14 08:58:45282 j - leave this hunk undecided, see next undecided hunk
283 J - leave this hunk undecided, see next hunk
284 k - leave this hunk undecided, see previous undecided hunk
285 K - leave this hunk undecided, see previous hunk
Junio C Hamanoe0facb92007-12-05 10:59:48286 s - split the current hunk into smaller hunks
Junio C Hamano46a38aa2008-07-14 03:13:27287 e - manually edit the current hunk
Junio C Hamanoe0facb92007-12-05 10:59:48288 ? - print help
Junio C Hamano17bbaca2006-12-25 11:36:31289+
290After deciding the fate for all hunks, if there is any hunk
291that was chosen, the index is updated with the selected hunks.
292
293diff::
294
295 This lets you review what will be committed (i.e. between
296 HEAD and index).
297
Junio C Hamano9049d912008-05-29 02:09:50298SEE ALSO
Junio C Hamano2bb13102006-03-06 07:10:21299--------
Junio C Hamano35738e82008-01-07 07:55:46300linkgit:git-status[1]
301linkgit:git-rm[1]
302linkgit:git-reset[1]
303linkgit:git-mv[1]
304linkgit:git-commit[1]
305linkgit:git-update-index[1]
Junio C Hamano1a4e8412005-12-27 08:17:23306
307Author
308------
309Written by Linus Torvalds <torvalds@osdl.org>
310
311Documentation
312--------------
313Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
314
315GIT
316---
Junio C Hamanof7c042d2008-06-06 22:50:53317Part of the linkgit:git[1] suite