blob: be5e3ac54b858778c8454970e8abae81b0c4841f [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 Hamanoe8acc8e2015-01-14 22:01:3411'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]
Junio C Hamanof26c77e2013-04-27 00:06:0412 [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]
Junio C Hamano4886c772017-11-27 03:33:2813 [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]
Junio C Hamano2f5a9892019-12-25 21:12:5514 [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]
15 [--] [<pathspec>...]
Junio C Hamano1a4e8412005-12-27 08:17:2316
17DESCRIPTION
18-----------
Junio C Hamanoae05fee2010-01-08 07:39:4619This command updates the index using the current content found in
20the working tree, to prepare the content staged for the next commit.
21It typically adds the current content of existing paths as a whole,
22but with some options it can also be used to add content with
23only part of the changes made to the working tree files applied, or
24remove paths that do not exist in the working tree anymore.
Junio C Hamano1a4e8412005-12-27 08:17:2325
Junio C Hamano4cd1c0e2007-08-06 04:39:1426The "index" holds a snapshot of the content of the working tree, and it
27is this snapshot that is taken as the contents of the next commit. Thus
Junio C Hamanoffe10ca2016-02-04 00:44:2328after making any changes to the working tree, and before running
Junio C Hamanoae05fee2010-01-08 07:39:4629the commit command, you must use the `add` command to add any new or
Junio C Hamano4cd1c0e2007-08-06 04:39:1430modified files to the index.
Junio C Hamanoe7935c42006-12-13 21:32:1731
Junio C Hamano4cd1c0e2007-08-06 04:39:1432This command can be performed multiple times before a commit. It only
33adds the content of the specified file(s) at the time the add command is
34run; if you want subsequent changes included in the next commit, then
Junio C Hamanoae05fee2010-01-08 07:39:4635you must run `git add` again to add the new content to the index.
Junio C Hamanoe7935c42006-12-13 21:32:1736
Junio C Hamanoae05fee2010-01-08 07:39:4637The `git status` command can be used to obtain a summary of which
Junio C Hamano4cd1c0e2007-08-06 04:39:1438files have changes that are staged for the next commit.
39
Junio C Hamanoae05fee2010-01-08 07:39:4640The `git add` command will not add ignored files by default. If any
41ignored files were explicitly specified on the command line, `git add`
Junio C Hamano3c1f2c72007-08-17 07:48:0542will fail with a list of ignored files. Ignored files reached by
Junio C Hamano7d9e9bd2007-08-29 07:31:4743directory recursion or filename globbing performed by Git (quote your
Junio C Hamano1aa40d22010-01-21 17:46:4344globs before the shell) will be silently ignored. The 'git add' command can
Junio C Hamano7d9e9bd2007-08-29 07:31:4745be used to add ignored files with the `-f` (force) option.
Junio C Hamano1a4e8412005-12-27 08:17:2346
Junio C Hamano35738e82008-01-07 07:55:4647Please see linkgit:git-commit[1] for alternative ways to add content to a
Junio C Hamanoe7935c42006-12-13 21:32:1748commit.
49
50
Junio C Hamano1a4e8412005-12-27 08:17:2351OPTIONS
52-------
Junio C Hamanobca4cd62013-02-13 00:01:0253<pathspec>...::
Junio C Hamano3d2adc72006-12-26 03:21:4554Files to add content from. Fileglobs (e.g. `*.c`) can
55be given to add all matching files. Also a
56leading directory name (e.g. `dir` to add `dir/file1`
Junio C Hamano1d669b82014-03-11 21:36:0057and `dir/file2`) can be given to update the index to
58match the current state of the directory as a whole (e.g.
59specifying `dir` will record not just a file `dir/file1`
60modified in the working tree, a file `dir/file2` added to
61the working tree, but also a file `dir/file3` removed from
Junio C Hamano2567b322019-02-05 23:33:5662the working tree). Note that older versions of Git used
Junio C Hamano1d669b82014-03-11 21:36:0063to ignore removed files; use `--no-all` option if you want
Junio C Hamano2567b322019-02-05 23:33:5664to add modified or new files but ignore removed ones.
Junio C Hamano139b7d12017-10-03 07:10:5965+
66For more details about the <pathspec> syntax, see the 'pathspec' entry
67in linkgit:gitglossary[7].
Junio C Hamano1a4e8412005-12-27 08:17:2368
Junio C Hamanoeb415992008-06-08 22:49:4769-n::
70--dry-run::
Junio C Hamanoafabd322010-07-19 20:26:1571Don't actually add the file(s), just show if they exist and/or will
72be ignored.
Junio C Hamano1a4e8412005-12-27 08:17:2373
Junio C Hamanoeb415992008-06-08 22:49:4774-v::
75--verbose::
Junio C Hamano1a4e8412005-12-27 08:17:2376 Be verbose.
77
Junio C Hamano3d2adc72006-12-26 03:21:4578-f::
Junio C Hamano00e884a2008-06-15 05:10:3879--force::
Junio C Hamano3d2adc72006-12-26 03:21:4580Allow adding otherwise ignored files.
81
Junio C Hamanoeb415992008-06-08 22:49:4782-i::
83--interactive::
Junio C Hamano17bbaca2006-12-25 11:36:3184Add modified contents in the working tree interactively to
Junio C Hamanoe0facb92007-12-05 10:59:4885the index. Optional path arguments may be supplied to limit
86operation to a subset of the working tree. See ``Interactive
87mode'' for details.
88
Junio C Hamanoeb415992008-06-08 22:49:4789-p::
90--patch::
Junio C Hamano7df6dcf2009-09-13 09:51:1791Interactively choose hunks of patch between the index and the
92work tree and add them to the index. This gives the user a chance
93to review the difference before adding modified contents to the
94index.
Junio C Hamanoe1b26832009-11-15 10:02:5695+
96This effectively runs `add --interactive`, but bypasses the
97initial command menu and directly jumps to the `patch` subcommand.
98See ``Interactive mode'' for details.
Junio C Hamano17bbaca2006-12-25 11:36:3199
Junio C Hamano1dbca522015-05-22 20:48:55100-e::
101--edit::
Junio C Hamano52ba2952009-05-18 17:43:02102Open the diff vs. the index in an editor and let the user
103edit it. After the editor was closed, adjust the hunk headers
104and apply the patch to the index.
105+
Junio C Hamano97bcb482010-11-25 03:16:07106The intent of this option is to pick and choose lines of the patch to
107apply, or even to modify the contents of lines to be staged. This can be
108quicker and more flexible than using the interactive hunk selector.
109However, it is easy to confuse oneself and create a patch that does not
110apply to the index. See EDITING PATCHES below.
Junio C Hamano52ba2952009-05-18 17:43:02111
Junio C Hamano3d30fd52007-05-08 00:32:53112-u::
Junio C Hamano00e884a2008-06-15 05:10:38113--update::
Junio C Hamanof66c4632013-03-11 20:54:25114Update the index just where it already has an entry matching
115<pathspec>. This removes as well as modifies index entries to
116match the working tree, but adds no new files.
Junio C Hamanoae05fee2010-01-08 07:39:46117+
Junio C Hamano1d669b82014-03-11 21:36:00118If no <pathspec> is given when `-u` option is used, all
119tracked files in the entire working tree are updated (old versions
120of Git used to limit the update to the current directory and its
121subdirectories).
Junio C Hamano3d30fd52007-05-08 00:32:53122
Junio C Hamano5ba2c222008-07-21 04:33:46123-A::
124--all::
Junio C Hamanof26c77e2013-04-27 00:06:04125--no-ignore-removal::
Junio C Hamanof66c4632013-03-11 20:54:25126Update the index not only where the working tree has a file
127matching <pathspec> but also where the index already has an
Junio C Hamano2567b322019-02-05 23:33:56128entry. This adds, modifies, and removes index entries to
Junio C Hamanof66c4632013-03-11 20:54:25129match the working tree.
130+
Junio C Hamano1d669b82014-03-11 21:36:00131If no <pathspec> is given when `-A` option is used, all
132files in the entire working tree are updated (old versions
133of Git used to limit the update to the current directory and its
134subdirectories).
Junio C Hamano845880c2008-10-21 19:04:45135
Junio C Hamanoc79bc672013-04-22 19:12:47136--no-all::
Junio C Hamanof26c77e2013-04-27 00:06:04137--ignore-removal::
Junio C Hamanoc79bc672013-04-22 19:12:47138Update the index by adding new files that are unknown to the
139index and files modified in the working tree, but ignore
140files that have been removed from the working tree. This
141option is a no-op when no <pathspec> is used.
142+
Junio C Hamano1d669b82014-03-11 21:36:00143This option is primarily to help users who are used to older
144versions of Git, whose "git add <pathspec>..." was a synonym
145for "git add --no-all <pathspec>...", i.e. ignored removed files.
Junio C Hamanoc79bc672013-04-22 19:12:47146
Junio C Hamano845880c2008-10-21 19:04:45147-N::
148--intent-to-add::
149Record only the fact that the path will be added later. An entry
150for the path is placed in the index with no content. This is
151useful for, among other things, showing the unstaged content of
Junio C Hamanoae05fee2010-01-08 07:39:46152such files with `git diff` and committing them with `git commit
153-a`.
Junio C Hamano845880c2008-10-21 19:04:45154
Junio C Hamanoeb415992008-06-08 22:49:47155--refresh::
Junio C Hamano024b6c62007-08-14 09:43:08156Don't add the file(s), but only refresh their stat()
157information in the index.
158
Junio C Hamanoeb415992008-06-08 22:49:47159--ignore-errors::
Junio C Hamanofeeb1be2008-05-22 00:53:35160If some files could not be added because of errors indexing
161them, do not abort the operation, but continue adding the
162others. The command shall still exit with non-zero status.
Junio C Hamanob77f8192011-05-05 01:30:38163The configuration variable `add.ignoreErrors` can be set to
164true to make this the default behaviour.
Junio C Hamanofeeb1be2008-05-22 00:53:35165
Junio C Hamanoafabd322010-07-19 20:26:15166--ignore-missing::
167This option can only be used together with --dry-run. By using
168this option the user can check if any of the given files would
169be ignored, no matter if they are already present in the work
170tree or not.
171
Junio C Hamano535c65c2017-06-24 22:51:58172--no-warn-embedded-repo::
173By default, `git add` will warn when adding an embedded
174repository to the index without using `git submodule add` to
175create an entry in `.gitmodules`. This option will suppress the
176warning (e.g., if you are manually performing operations on
177submodules).
178
Junio C Hamano4886c772017-11-27 03:33:28179--renormalize::
180Apply the "clean" process freshly to all tracked files to
181forcibly add them again to the index. This is useful after
182changing `core.autocrlf` configuration or the `text` attribute
183in order to correct files added with wrong CRLF/LF line endings.
184This option implies `-u`.
185
Junio C Hamano53800482016-09-21 23:26:43186--chmod=(+|-)x::
187Override the executable bit of the added files. The executable
188bit is only changed in the index, the files on disk are left
189unchanged.
190
Junio C Hamano2f5a9892019-12-25 21:12:55191--pathspec-from-file=<file>::
192Pathspec is passed in `<file>` instead of commandline args. If
193`<file>` is exactly `-` then standard input is used. Pathspec
194elements are separated by LF or CR/LF. Pathspec elements can be
195quoted as explained for the configuration variable `core.quotePath`
196(see linkgit:git-config[1]). See also `--pathspec-file-nul` and
197global `--literal-pathspecs`.
198
199--pathspec-file-nul::
200Only meaningful with `--pathspec-from-file`. Pathspec elements are
201separated with NUL character and all other characters are taken
202literally (including newlines and quotes).
203
Junio C Hamano1bb569e2006-05-05 23:14:25204\--::
Junio C Hamano7e9f6b72006-02-22 10:44:55205This option can be used to separate command-line options from
206the list of files, (useful when filenames might be mistaken
207for command-line options).
208
Junio C Hamano1a4e8412005-12-27 08:17:23209
Junio C Hamano1a4e8412005-12-27 08:17:23210EXAMPLES
211--------
Junio C Hamano1a4e8412005-12-27 08:17:23212
Junio C Hamano2db3e752010-09-03 21:33:06213* Adds content from all `*.txt` files under `Documentation` directory
Junio C Hamano2567b322019-02-05 23:33:56214 and its subdirectories:
Junio C Hamano6d76d612008-05-09 05:46:08215+
216------------
Junio C Hamano78b92a82010-02-09 07:34:13217$ git add Documentation/\*.txt
Junio C Hamano6d76d612008-05-09 05:46:08218------------
Junio C Hamano1a4e8412005-12-27 08:17:23219+
Junio C Hamano2db3e752010-09-03 21:33:06220Note that the asterisk `*` is quoted from the shell in this
Junio C Hamanof8a79222009-03-01 08:02:50221example; this lets the command include the files from
Junio C Hamano1a4e8412005-12-27 08:17:23222subdirectories of `Documentation/` directory.
223
Junio C Hamano6d76d612008-05-09 05:46:08224* Considers adding content from all git-*.sh scripts:
225+
226------------
227$ git add git-*.sh
228------------
229+
Junio C Hamanof8a79222009-03-01 08:02:50230Because this example lets the shell expand the asterisk (i.e. you are
Junio C Hamano6d76d612008-05-09 05:46:08231listing the files explicitly), it does not consider
232`subdir/git-foo.sh`.
Junio C Hamano1a4e8412005-12-27 08:17:23233
Junio C Hamanob9d9d902018-05-23 07:07:42234INTERACTIVE MODE
Junio C Hamano17bbaca2006-12-25 11:36:31235----------------
236When the command enters the interactive mode, it shows the
Junio C Hamanof9771f62007-01-17 17:42:30237output of the 'status' subcommand, and then goes into its
Junio C Hamano17bbaca2006-12-25 11:36:31238interactive command loop.
239
240The command loop shows the list of subcommands available, and
241gives a prompt "What now> ". In general, when the prompt ends
242with a single '>', you can pick only one of the choices given
243and type return, like this:
244
245------------
246 *** Commands ***
247 1: status 2: update 3: revert 4: add untracked
248 5: patch 6: diff 7: quit 8: help
249 What now> 1
250------------
251
Junio C Hamanoae05fee2010-01-08 07:39:46252You also could say `s` or `sta` or `status` above as long as the
Junio C Hamano17bbaca2006-12-25 11:36:31253choice is unique.
254
255The main command loop has 6 subcommands (plus help and quit).
256
257status::
258
259 This shows the change between HEAD and index (i.e. what will be
Junio C Hamanoae05fee2010-01-08 07:39:46260 committed if you say `git commit`), and between index and
Junio C Hamano17bbaca2006-12-25 11:36:31261 working tree files (i.e. what you could stage further before
Junio C Hamanoae05fee2010-01-08 07:39:46262 `git commit` using `git add`) for each path. A sample output
Junio C Hamano17bbaca2006-12-25 11:36:31263 looks like this:
264+
265------------
266 staged unstaged path
267 1: binary nothing foo.png
268 2: +403/-35 +1/-1 git-add--interactive.perl
269------------
270+
271It shows that foo.png has differences from HEAD (but that is
272binary so line count cannot be shown) and there is no
273difference between indexed copy and the working tree
274version (if the working tree version were also different,
275'binary' would have been shown in place of 'nothing'). The
Junio C Hamano2db3e752010-09-03 21:33:06276other file, git-add{litdd}interactive.perl, has 403 lines added
Junio C Hamano17bbaca2006-12-25 11:36:31277and 35 lines deleted if you commit what is in the index, but
278working tree file has further modifications (one addition and
279one deletion).
280
281update::
282
Junio C Hamanof8a79222009-03-01 08:02:50283 This shows the status information and issues an "Update>>"
284 prompt. When the prompt ends with double '>>', you can
Junio C Hamano17bbaca2006-12-25 11:36:31285 make more than one selection, concatenated with whitespace or
286 comma. Also you can say ranges. E.g. "2-5 7,9" to choose
Junio C Hamano38ddcce2008-07-15 15:49:03287 2,3,4,5,7,9 from the list. If the second number in a range is
288 omitted, all remaining patches are taken. E.g. "7-" to choose
289 7,8,9 from the list. You can say '*' to choose everything.
Junio C Hamano17bbaca2006-12-25 11:36:31290+
291What you chose are then highlighted with '*',
292like this:
293+
294------------
295 staged unstaged path
296 1: binary nothing foo.png
297* 2: +403/-35 +1/-1 git-add--interactive.perl
298------------
299+
300To remove selection, prefix the input with `-`
301like this:
302+
303------------
304Update>> -2
305------------
306+
307After making the selection, answer with an empty line to stage the
308contents of working tree files for selected paths in the index.
309
310revert::
311
312 This has a very similar UI to 'update', and the staged
313 information for selected paths are reverted to that of the
314 HEAD version. Reverting new paths makes them untracked.
315
316add untracked::
317
318 This has a very similar UI to 'update' and
319 'revert', and lets you add untracked paths to the index.
320
321patch::
322
Junio C Hamanof8a79222009-03-01 08:02:50323 This lets you choose one path out of a 'status' like selection.
324 After choosing the path, it presents the diff between the index
Junio C Hamano17bbaca2006-12-25 11:36:31325 and the working tree file and asks you if you want to stage
Junio C Hamano9eb58352011-05-11 20:09:24326 the change of each hunk. You can select one of the following
327 options and type return:
Junio C Hamano17bbaca2006-12-25 11:36:31328
Junio C Hamano8760ea62008-03-14 08:58:45329 y - stage this hunk
330 n - do not stage this hunk
Junio C Hamanod75148a2014-04-08 19:48:38331 q - quit; do not stage this hunk or any of the remaining ones
Junio C Hamanoa574a092010-06-13 19:57:10332 a - stage this hunk and all later hunks in the file
Junio C Hamanod75148a2014-04-08 19:48:38333 d - do not stage this hunk or any of the later hunks in the file
Junio C Hamano3bd66e92009-04-18 06:17:56334 g - select a hunk to go to
335 / - search for a hunk matching the given regex
Junio C Hamano8760ea62008-03-14 08:58:45336 j - leave this hunk undecided, see next undecided hunk
337 J - leave this hunk undecided, see next hunk
338 k - leave this hunk undecided, see previous undecided hunk
339 K - leave this hunk undecided, see previous hunk
Junio C Hamanoe0facb92007-12-05 10:59:48340 s - split the current hunk into smaller hunks
Junio C Hamano46a38aa2008-07-14 03:13:27341 e - manually edit the current hunk
Junio C Hamanoe0facb92007-12-05 10:59:48342 ? - print help
Junio C Hamano17bbaca2006-12-25 11:36:31343+
344After deciding the fate for all hunks, if there is any hunk
345that was chosen, the index is updated with the selected hunks.
Junio C Hamano9eb58352011-05-11 20:09:24346+
347You can omit having to type return here, by setting the configuration
Junio C Hamano322c6242015-03-23 21:32:46348variable `interactive.singleKey` to `true`.
Junio C Hamano17bbaca2006-12-25 11:36:31349
350diff::
351
352 This lets you review what will be committed (i.e. between
353 HEAD and index).
354
Junio C Hamano97bcb482010-11-25 03:16:07355
356EDITING PATCHES
357---------------
358
359Invoking `git add -e` or selecting `e` from the interactive hunk
360selector will open a patch in your editor; after the editor exits, the
361result is applied to the index. You are free to make arbitrary changes
362to the patch, but note that some changes may have confusing results, or
363even result in a patch that cannot be applied. If you want to abort the
364operation entirely (i.e., stage nothing new in the index), simply delete
365all lines of the patch. The list below describes some common things you
366may see in a patch, and which editing operations make sense on them.
367
368--
369added content::
370
371Added content is represented by lines beginning with "{plus}". You can
372prevent staging any addition lines by deleting them.
373
374removed content::
375
376Removed content is represented by lines beginning with "-". You can
377prevent staging their removal by converting the "-" to a " " (space).
378
379modified content::
380
381Modified content is represented by "-" lines (removing the old content)
382followed by "{plus}" lines (adding the replacement content). You can
383prevent staging the modification by converting "-" lines to " ", and
384removing "{plus}" lines. Beware that modifying only half of the pair is
385likely to introduce confusing changes to the index.
386--
387
388There are also more complex operations that can be performed. But beware
389that because the patch is applied only to the index and not the working
390tree, the working tree will appear to "undo" the change in the index.
Junio C Hamano7165bf72011-01-04 22:06:18391For example, introducing a new line into the index that is in neither
Junio C Hamano97bcb482010-11-25 03:16:07392the HEAD nor the working tree will stage the new line for commit, but
393the line will appear to be reverted in the working tree.
394
395Avoid using these constructs, or do so with extreme caution.
396
397--
398removing untouched content::
399
400Content which does not differ between the index and working tree may be
401shown on context lines, beginning with a " " (space). You can stage
402context lines for removal by converting the space to a "-". The
403resulting working tree file will appear to re-add the content.
404
405modifying existing content::
406
407One can also modify context lines by staging them for removal (by
408converting " " to "-") and adding a "{plus}" line with the new content.
409Similarly, one can modify "{plus}" lines for existing additions or
410modifications. In all cases, the new modification will appear reverted
411in the working tree.
412
413new content::
414
415You may also add new content that does not exist in the patch; simply
416add new lines, each starting with "{plus}". The addition will appear
417reverted in the working tree.
418--
419
420There are also several operations which should be avoided entirely, as
421they will make the patch impossible to apply:
422
423* adding context (" ") or removal ("-") lines
424* deleting context or removal lines
425* modifying the contents of context or removal lines
426
Junio C Hamano9049d912008-05-29 02:09:50427SEE ALSO
Junio C Hamano2bb13102006-03-06 07:10:21428--------
Junio C Hamano35738e82008-01-07 07:55:46429linkgit:git-status[1]
430linkgit:git-rm[1]
431linkgit:git-reset[1]
432linkgit:git-mv[1]
433linkgit:git-commit[1]
434linkgit:git-update-index[1]
Junio C Hamano1a4e8412005-12-27 08:17:23435
Junio C Hamano1a4e8412005-12-27 08:17:23436GIT
437---
Junio C Hamanof7c042d2008-06-06 22:50:53438Part of the linkgit:git[1] suite