blob: ed44c1cb31ca6eaf7e63d7920cbc15c3a2e0619f [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 Hamano7b1585b2021-10-14 17:11:5812 [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]] [--sparse]
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 Hamano7b1585b2021-10-14 17:11:5882--sparse::
83Allow updating index entries outside of the sparse-checkout cone.
84Normally, `git add` refuses to update index entries whose paths do
85not fit within the sparse-checkout cone, since those files might
86be removed from the working tree without warning. See
87linkgit:git-sparse-checkout[1] for more details.
88
Junio C Hamanoeb415992008-06-08 22:49:4789-i::
90--interactive::
Junio C Hamano17bbaca2006-12-25 11:36:3191Add modified contents in the working tree interactively to
Junio C Hamanoe0facb92007-12-05 10:59:4892the index. Optional path arguments may be supplied to limit
93operation to a subset of the working tree. See ``Interactive
94mode'' for details.
95
Junio C Hamanoeb415992008-06-08 22:49:4796-p::
97--patch::
Junio C Hamano7df6dcf2009-09-13 09:51:1798Interactively choose hunks of patch between the index and the
99work tree and add them to the index. This gives the user a chance
100to review the difference before adding modified contents to the
101index.
Junio C Hamanoe1b26832009-11-15 10:02:56102+
103This effectively runs `add --interactive`, but bypasses the
104initial command menu and directly jumps to the `patch` subcommand.
105See ``Interactive mode'' for details.
Junio C Hamano17bbaca2006-12-25 11:36:31106
Junio C Hamano1dbca522015-05-22 20:48:55107-e::
108--edit::
Junio C Hamano52ba2952009-05-18 17:43:02109Open the diff vs. the index in an editor and let the user
110edit it. After the editor was closed, adjust the hunk headers
111and apply the patch to the index.
112+
Junio C Hamano97bcb482010-11-25 03:16:07113The intent of this option is to pick and choose lines of the patch to
114apply, or even to modify the contents of lines to be staged. This can be
115quicker and more flexible than using the interactive hunk selector.
116However, it is easy to confuse oneself and create a patch that does not
117apply to the index. See EDITING PATCHES below.
Junio C Hamano52ba2952009-05-18 17:43:02118
Junio C Hamano3d30fd52007-05-08 00:32:53119-u::
Junio C Hamano00e884a2008-06-15 05:10:38120--update::
Junio C Hamanof66c4632013-03-11 20:54:25121Update the index just where it already has an entry matching
122<pathspec>. This removes as well as modifies index entries to
123match the working tree, but adds no new files.
Junio C Hamanoae05fee2010-01-08 07:39:46124+
Junio C Hamano1d669b82014-03-11 21:36:00125If no <pathspec> is given when `-u` option is used, all
126tracked files in the entire working tree are updated (old versions
127of Git used to limit the update to the current directory and its
128subdirectories).
Junio C Hamano3d30fd52007-05-08 00:32:53129
Junio C Hamano5ba2c222008-07-21 04:33:46130-A::
131--all::
Junio C Hamanof26c77e2013-04-27 00:06:04132--no-ignore-removal::
Junio C Hamanof66c4632013-03-11 20:54:25133Update the index not only where the working tree has a file
134matching <pathspec> but also where the index already has an
Junio C Hamano2567b322019-02-05 23:33:56135entry. This adds, modifies, and removes index entries to
Junio C Hamanof66c4632013-03-11 20:54:25136match the working tree.
137+
Junio C Hamano1d669b82014-03-11 21:36:00138If no <pathspec> is given when `-A` option is used, all
139files in the entire working tree are updated (old versions
140of Git used to limit the update to the current directory and its
141subdirectories).
Junio C Hamano845880c2008-10-21 19:04:45142
Junio C Hamanoc79bc672013-04-22 19:12:47143--no-all::
Junio C Hamanof26c77e2013-04-27 00:06:04144--ignore-removal::
Junio C Hamanoc79bc672013-04-22 19:12:47145Update the index by adding new files that are unknown to the
146index and files modified in the working tree, but ignore
147files that have been removed from the working tree. This
148option is a no-op when no <pathspec> is used.
149+
Junio C Hamano1d669b82014-03-11 21:36:00150This option is primarily to help users who are used to older
151versions of Git, whose "git add <pathspec>..." was a synonym
152for "git add --no-all <pathspec>...", i.e. ignored removed files.
Junio C Hamanoc79bc672013-04-22 19:12:47153
Junio C Hamano845880c2008-10-21 19:04:45154-N::
155--intent-to-add::
156Record only the fact that the path will be added later. An entry
157for the path is placed in the index with no content. This is
158useful for, among other things, showing the unstaged content of
Junio C Hamanoae05fee2010-01-08 07:39:46159such files with `git diff` and committing them with `git commit
160-a`.
Junio C Hamano845880c2008-10-21 19:04:45161
Junio C Hamanoeb415992008-06-08 22:49:47162--refresh::
Junio C Hamano024b6c62007-08-14 09:43:08163Don't add the file(s), but only refresh their stat()
164information in the index.
165
Junio C Hamanoeb415992008-06-08 22:49:47166--ignore-errors::
Junio C Hamanofeeb1be2008-05-22 00:53:35167If some files could not be added because of errors indexing
168them, do not abort the operation, but continue adding the
169others. The command shall still exit with non-zero status.
Junio C Hamanob77f8192011-05-05 01:30:38170The configuration variable `add.ignoreErrors` can be set to
171true to make this the default behaviour.
Junio C Hamanofeeb1be2008-05-22 00:53:35172
Junio C Hamanoafabd322010-07-19 20:26:15173--ignore-missing::
174This option can only be used together with --dry-run. By using
175this option the user can check if any of the given files would
176be ignored, no matter if they are already present in the work
177tree or not.
178
Junio C Hamano535c65c2017-06-24 22:51:58179--no-warn-embedded-repo::
180By default, `git add` will warn when adding an embedded
181repository to the index without using `git submodule add` to
182create an entry in `.gitmodules`. This option will suppress the
183warning (e.g., if you are manually performing operations on
184submodules).
185
Junio C Hamano4886c772017-11-27 03:33:28186--renormalize::
187Apply the "clean" process freshly to all tracked files to
188forcibly add them again to the index. This is useful after
189changing `core.autocrlf` configuration or the `text` attribute
190in order to correct files added with wrong CRLF/LF line endings.
Junio C Hamano04495a12022-08-18 21:13:08191This option implies `-u`. Lone CR characters are untouched, thus
192while a CRLF cleans to LF, a CRCRLF sequence is only partially
193cleaned to CRLF.
Junio C Hamano4886c772017-11-27 03:33:28194
Junio C Hamano53800482016-09-21 23:26:43195--chmod=(+|-)x::
196Override the executable bit of the added files. The executable
197bit is only changed in the index, the files on disk are left
198unchanged.
199
Junio C Hamano2f5a9892019-12-25 21:12:55200--pathspec-from-file=<file>::
201Pathspec is passed in `<file>` instead of commandline args. If
202`<file>` is exactly `-` then standard input is used. Pathspec
203elements are separated by LF or CR/LF. Pathspec elements can be
204quoted as explained for the configuration variable `core.quotePath`
205(see linkgit:git-config[1]). See also `--pathspec-file-nul` and
206global `--literal-pathspecs`.
207
208--pathspec-file-nul::
209Only meaningful with `--pathspec-from-file`. Pathspec elements are
210separated with NUL character and all other characters are taken
211literally (including newlines and quotes).
212
Junio C Hamano1bb569e2006-05-05 23:14:25213\--::
Junio C Hamano7e9f6b72006-02-22 10:44:55214This option can be used to separate command-line options from
215the list of files, (useful when filenames might be mistaken
216for command-line options).
217
Junio C Hamano1a4e8412005-12-27 08:17:23218
Junio C Hamano1a4e8412005-12-27 08:17:23219EXAMPLES
220--------
Junio C Hamano1a4e8412005-12-27 08:17:23221
Junio C Hamano2db3e752010-09-03 21:33:06222* Adds content from all `*.txt` files under `Documentation` directory
Junio C Hamano2567b322019-02-05 23:33:56223 and its subdirectories:
Junio C Hamano6d76d612008-05-09 05:46:08224+
225------------
Junio C Hamano78b92a82010-02-09 07:34:13226$ git add Documentation/\*.txt
Junio C Hamano6d76d612008-05-09 05:46:08227------------
Junio C Hamano1a4e8412005-12-27 08:17:23228+
Junio C Hamano2db3e752010-09-03 21:33:06229Note that the asterisk `*` is quoted from the shell in this
Junio C Hamanof8a79222009-03-01 08:02:50230example; this lets the command include the files from
Junio C Hamano1a4e8412005-12-27 08:17:23231subdirectories of `Documentation/` directory.
232
Junio C Hamano6d76d612008-05-09 05:46:08233* Considers adding content from all git-*.sh scripts:
234+
235------------
236$ git add git-*.sh
237------------
238+
Junio C Hamanof8a79222009-03-01 08:02:50239Because this example lets the shell expand the asterisk (i.e. you are
Junio C Hamano6d76d612008-05-09 05:46:08240listing the files explicitly), it does not consider
241`subdir/git-foo.sh`.
Junio C Hamano1a4e8412005-12-27 08:17:23242
Junio C Hamanob9d9d902018-05-23 07:07:42243INTERACTIVE MODE
Junio C Hamano17bbaca2006-12-25 11:36:31244----------------
245When the command enters the interactive mode, it shows the
Junio C Hamanof9771f62007-01-17 17:42:30246output of the 'status' subcommand, and then goes into its
Junio C Hamano17bbaca2006-12-25 11:36:31247interactive command loop.
248
249The command loop shows the list of subcommands available, and
250gives a prompt "What now> ". In general, when the prompt ends
251with a single '>', you can pick only one of the choices given
252and type return, like this:
253
254------------
255 *** Commands ***
256 1: status 2: update 3: revert 4: add untracked
257 5: patch 6: diff 7: quit 8: help
258 What now> 1
259------------
260
Junio C Hamanoae05fee2010-01-08 07:39:46261You also could say `s` or `sta` or `status` above as long as the
Junio C Hamano17bbaca2006-12-25 11:36:31262choice is unique.
263
264The main command loop has 6 subcommands (plus help and quit).
265
266status::
267
268 This shows the change between HEAD and index (i.e. what will be
Junio C Hamanoae05fee2010-01-08 07:39:46269 committed if you say `git commit`), and between index and
Junio C Hamano17bbaca2006-12-25 11:36:31270 working tree files (i.e. what you could stage further before
Junio C Hamanoae05fee2010-01-08 07:39:46271 `git commit` using `git add`) for each path. A sample output
Junio C Hamano17bbaca2006-12-25 11:36:31272 looks like this:
273+
274------------
275 staged unstaged path
276 1: binary nothing foo.png
Junio C Hamano3583c5c2023-02-22 23:31:59277 2: +403/-35 +1/-1 add-interactive.c
Junio C Hamano17bbaca2006-12-25 11:36:31278------------
279+
280It shows that foo.png has differences from HEAD (but that is
281binary so line count cannot be shown) and there is no
282difference between indexed copy and the working tree
283version (if the working tree version were also different,
284'binary' would have been shown in place of 'nothing'). The
Junio C Hamano3583c5c2023-02-22 23:31:59285other file, add-interactive.c, has 403 lines added
Junio C Hamano17bbaca2006-12-25 11:36:31286and 35 lines deleted if you commit what is in the index, but
287working tree file has further modifications (one addition and
288one deletion).
289
290update::
291
Junio C Hamanof8a79222009-03-01 08:02:50292 This shows the status information and issues an "Update>>"
293 prompt. When the prompt ends with double '>>', you can
Junio C Hamano17bbaca2006-12-25 11:36:31294 make more than one selection, concatenated with whitespace or
295 comma. Also you can say ranges. E.g. "2-5 7,9" to choose
Junio C Hamano38ddcce2008-07-15 15:49:03296 2,3,4,5,7,9 from the list. If the second number in a range is
297 omitted, all remaining patches are taken. E.g. "7-" to choose
298 7,8,9 from the list. You can say '*' to choose everything.
Junio C Hamano17bbaca2006-12-25 11:36:31299+
300What you chose are then highlighted with '*',
301like this:
302+
303------------
304 staged unstaged path
305 1: binary nothing foo.png
Junio C Hamano3583c5c2023-02-22 23:31:59306* 2: +403/-35 +1/-1 add-interactive.c
Junio C Hamano17bbaca2006-12-25 11:36:31307------------
308+
309To remove selection, prefix the input with `-`
310like this:
311+
312------------
313Update>> -2
314------------
315+
316After making the selection, answer with an empty line to stage the
317contents of working tree files for selected paths in the index.
318
319revert::
320
321 This has a very similar UI to 'update', and the staged
322 information for selected paths are reverted to that of the
323 HEAD version. Reverting new paths makes them untracked.
324
325add untracked::
326
327 This has a very similar UI to 'update' and
328 'revert', and lets you add untracked paths to the index.
329
330patch::
331
Junio C Hamanof8a79222009-03-01 08:02:50332 This lets you choose one path out of a 'status' like selection.
333 After choosing the path, it presents the diff between the index
Junio C Hamano17bbaca2006-12-25 11:36:31334 and the working tree file and asks you if you want to stage
Junio C Hamano9eb58352011-05-11 20:09:24335 the change of each hunk. You can select one of the following
336 options and type return:
Junio C Hamano17bbaca2006-12-25 11:36:31337
Junio C Hamano8760ea62008-03-14 08:58:45338 y - stage this hunk
339 n - do not stage this hunk
Junio C Hamanod75148a2014-04-08 19:48:38340 q - quit; do not stage this hunk or any of the remaining ones
Junio C Hamanoa574a092010-06-13 19:57:10341 a - stage this hunk and all later hunks in the file
Junio C Hamanod75148a2014-04-08 19:48:38342 d - do not stage this hunk or any of the later hunks in the file
Junio C Hamano3bd66e92009-04-18 06:17:56343 g - select a hunk to go to
344 / - search for a hunk matching the given regex
Junio C Hamano8760ea62008-03-14 08:58:45345 j - leave this hunk undecided, see next undecided hunk
346 J - leave this hunk undecided, see next hunk
347 k - leave this hunk undecided, see previous undecided hunk
348 K - leave this hunk undecided, see previous hunk
Junio C Hamanoe0facb92007-12-05 10:59:48349 s - split the current hunk into smaller hunks
Junio C Hamano46a38aa2008-07-14 03:13:27350 e - manually edit the current hunk
Junio C Hamanoe0facb92007-12-05 10:59:48351 ? - print help
Junio C Hamano17bbaca2006-12-25 11:36:31352+
353After deciding the fate for all hunks, if there is any hunk
354that was chosen, the index is updated with the selected hunks.
Junio C Hamano9eb58352011-05-11 20:09:24355+
356You can omit having to type return here, by setting the configuration
Junio C Hamano322c6242015-03-23 21:32:46357variable `interactive.singleKey` to `true`.
Junio C Hamano17bbaca2006-12-25 11:36:31358
359diff::
360
361 This lets you review what will be committed (i.e. between
362 HEAD and index).
363
Junio C Hamano97bcb482010-11-25 03:16:07364
365EDITING PATCHES
366---------------
367
368Invoking `git add -e` or selecting `e` from the interactive hunk
369selector will open a patch in your editor; after the editor exits, the
370result is applied to the index. You are free to make arbitrary changes
371to the patch, but note that some changes may have confusing results, or
372even result in a patch that cannot be applied. If you want to abort the
373operation entirely (i.e., stage nothing new in the index), simply delete
374all lines of the patch. The list below describes some common things you
375may see in a patch, and which editing operations make sense on them.
376
377--
378added content::
379
380Added content is represented by lines beginning with "{plus}". You can
381prevent staging any addition lines by deleting them.
382
383removed content::
384
385Removed content is represented by lines beginning with "-". You can
386prevent staging their removal by converting the "-" to a " " (space).
387
388modified content::
389
390Modified content is represented by "-" lines (removing the old content)
391followed by "{plus}" lines (adding the replacement content). You can
392prevent staging the modification by converting "-" lines to " ", and
393removing "{plus}" lines. Beware that modifying only half of the pair is
394likely to introduce confusing changes to the index.
395--
396
397There are also more complex operations that can be performed. But beware
398that because the patch is applied only to the index and not the working
399tree, the working tree will appear to "undo" the change in the index.
Junio C Hamano7165bf72011-01-04 22:06:18400For example, introducing a new line into the index that is in neither
Junio C Hamano97bcb482010-11-25 03:16:07401the HEAD nor the working tree will stage the new line for commit, but
402the line will appear to be reverted in the working tree.
403
404Avoid using these constructs, or do so with extreme caution.
405
406--
407removing untouched content::
408
409Content which does not differ between the index and working tree may be
410shown on context lines, beginning with a " " (space). You can stage
411context lines for removal by converting the space to a "-". The
412resulting working tree file will appear to re-add the content.
413
414modifying existing content::
415
416One can also modify context lines by staging them for removal (by
417converting " " to "-") and adding a "{plus}" line with the new content.
418Similarly, one can modify "{plus}" lines for existing additions or
419modifications. In all cases, the new modification will appear reverted
420in the working tree.
421
422new content::
423
424You may also add new content that does not exist in the patch; simply
425add new lines, each starting with "{plus}". The addition will appear
426reverted in the working tree.
427--
428
429There are also several operations which should be avoided entirely, as
430they will make the patch impossible to apply:
431
432* adding context (" ") or removal ("-") lines
433* deleting context or removal lines
434* modifying the contents of context or removal lines
435
Junio C Hamanoba8baee2022-09-14 20:25:23436CONFIGURATION
437-------------
438
439include::includes/cmd-config-section-all.txt[]
440
441include::config/add.txt[]
442
Junio C Hamano9049d912008-05-29 02:09:50443SEE ALSO
Junio C Hamano2bb13102006-03-06 07:10:21444--------
Junio C Hamano35738e82008-01-07 07:55:46445linkgit:git-status[1]
446linkgit:git-rm[1]
447linkgit:git-reset[1]
448linkgit:git-mv[1]
449linkgit:git-commit[1]
450linkgit:git-update-index[1]
Junio C Hamano1a4e8412005-12-27 08:17:23451
Junio C Hamano1a4e8412005-12-27 08:17:23452GIT
453---
Junio C Hamanof7c042d2008-06-06 22:50:53454Part of the linkgit:git[1] suite