blob: d50fa339dcc523158896fda8cdccd1a2784dfdd7 [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 Hamano53800482016-09-21 23:26:4314 [--chmod=(+|-)x] [--] [<pathspec>...]
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
Junio C Hamanoffe10ca2016-02-04 00:44:2327after making any changes to the working tree, 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 Hamanobca4cd62013-02-13 00:01:0252<pathspec>...::
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`
Junio C Hamano1d669b82014-03-11 21:36:0056and `dir/file2`) can be given to update the index to
57match the current state of the directory as a whole (e.g.
58specifying `dir` will record not just a file `dir/file1`
59modified in the working tree, a file `dir/file2` added to
60the working tree, but also a file `dir/file3` removed from
61the working tree. Note that older versions of Git used
62to ignore removed files; use `--no-all` option if you want
63to add modified or new files but ignore removed ones.
Junio C Hamano139b7d12017-10-03 07:10:5964+
65For more details about the <pathspec> syntax, see the 'pathspec' entry
66in linkgit:gitglossary[7].
Junio C Hamano1a4e8412005-12-27 08:17:2367
Junio C Hamanoeb415992008-06-08 22:49:4768-n::
69--dry-run::
Junio C Hamanoafabd322010-07-19 20:26:1570Don't actually add the file(s), just show if they exist and/or will
71be ignored.
Junio C Hamano1a4e8412005-12-27 08:17:2372
Junio C Hamanoeb415992008-06-08 22:49:4773-v::
74--verbose::
Junio C Hamano1a4e8412005-12-27 08:17:2375 Be verbose.
76
Junio C Hamano3d2adc72006-12-26 03:21:4577-f::
Junio C Hamano00e884a2008-06-15 05:10:3878--force::
Junio C Hamano3d2adc72006-12-26 03:21:4579Allow adding otherwise ignored files.
80
Junio C Hamanoeb415992008-06-08 22:49:4781-i::
82--interactive::
Junio C Hamano17bbaca2006-12-25 11:36:3183Add modified contents in the working tree interactively to
Junio C Hamanoe0facb92007-12-05 10:59:4884the index. Optional path arguments may be supplied to limit
85operation to a subset of the working tree. See ``Interactive
86mode'' for details.
87
Junio C Hamanoeb415992008-06-08 22:49:4788-p::
89--patch::
Junio C Hamano7df6dcf2009-09-13 09:51:1790Interactively choose hunks of patch between the index and the
91work tree and add them to the index. This gives the user a chance
92to review the difference before adding modified contents to the
93index.
Junio C Hamanoe1b26832009-11-15 10:02:5694+
95This effectively runs `add --interactive`, but bypasses the
96initial command menu and directly jumps to the `patch` subcommand.
97See ``Interactive mode'' for details.
Junio C Hamano17bbaca2006-12-25 11:36:3198
Junio C Hamano1dbca522015-05-22 20:48:5599-e::
100--edit::
Junio C Hamano52ba2952009-05-18 17:43:02101Open the diff vs. the index in an editor and let the user
102edit it. After the editor was closed, adjust the hunk headers
103and apply the patch to the index.
104+
Junio C Hamano97bcb482010-11-25 03:16:07105The intent of this option is to pick and choose lines of the patch to
106apply, or even to modify the contents of lines to be staged. This can be
107quicker and more flexible than using the interactive hunk selector.
108However, it is easy to confuse oneself and create a patch that does not
109apply to the index. See EDITING PATCHES below.
Junio C Hamano52ba2952009-05-18 17:43:02110
Junio C Hamano3d30fd52007-05-08 00:32:53111-u::
Junio C Hamano00e884a2008-06-15 05:10:38112--update::
Junio C Hamanof66c4632013-03-11 20:54:25113Update the index just where it already has an entry matching
114<pathspec>. This removes as well as modifies index entries to
115match the working tree, but adds no new files.
Junio C Hamanoae05fee2010-01-08 07:39:46116+
Junio C Hamano1d669b82014-03-11 21:36:00117If no <pathspec> is given when `-u` option is used, all
118tracked files in the entire working tree are updated (old versions
119of Git used to limit the update to the current directory and its
120subdirectories).
Junio C Hamano3d30fd52007-05-08 00:32:53121
Junio C Hamano5ba2c222008-07-21 04:33:46122-A::
123--all::
Junio C Hamanof26c77e2013-04-27 00:06:04124--no-ignore-removal::
Junio C Hamanof66c4632013-03-11 20:54:25125Update the index not only where the working tree has a file
126matching <pathspec> but also where the index already has an
127entry. This adds, modifies, and removes index entries to
128match the working tree.
129+
Junio C Hamano1d669b82014-03-11 21:36:00130If no <pathspec> is given when `-A` option is used, all
131files in the entire working tree are updated (old versions
132of Git used to limit the update to the current directory and its
133subdirectories).
Junio C Hamano845880c2008-10-21 19:04:45134
Junio C Hamanoc79bc672013-04-22 19:12:47135--no-all::
Junio C Hamanof26c77e2013-04-27 00:06:04136--ignore-removal::
Junio C Hamanoc79bc672013-04-22 19:12:47137Update the index by adding new files that are unknown to the
138index and files modified in the working tree, but ignore
139files that have been removed from the working tree. This
140option is a no-op when no <pathspec> is used.
141+
Junio C Hamano1d669b82014-03-11 21:36:00142This option is primarily to help users who are used to older
143versions of Git, whose "git add <pathspec>..." was a synonym
144for "git add --no-all <pathspec>...", i.e. ignored removed files.
Junio C Hamanoc79bc672013-04-22 19:12:47145
Junio C Hamano845880c2008-10-21 19:04:45146-N::
147--intent-to-add::
148Record only the fact that the path will be added later. An entry
149for the path is placed in the index with no content. This is
150useful for, among other things, showing the unstaged content of
Junio C Hamanoae05fee2010-01-08 07:39:46151such files with `git diff` and committing them with `git commit
152-a`.
Junio C Hamano845880c2008-10-21 19:04:45153
Junio C Hamanoeb415992008-06-08 22:49:47154--refresh::
Junio C Hamano024b6c62007-08-14 09:43:08155Don't add the file(s), but only refresh their stat()
156information in the index.
157
Junio C Hamanoeb415992008-06-08 22:49:47158--ignore-errors::
Junio C Hamanofeeb1be2008-05-22 00:53:35159If some files could not be added because of errors indexing
160them, do not abort the operation, but continue adding the
161others. The command shall still exit with non-zero status.
Junio C Hamanob77f8192011-05-05 01:30:38162The configuration variable `add.ignoreErrors` can be set to
163true to make this the default behaviour.
Junio C Hamanofeeb1be2008-05-22 00:53:35164
Junio C Hamanoafabd322010-07-19 20:26:15165--ignore-missing::
166This option can only be used together with --dry-run. By using
167this option the user can check if any of the given files would
168be ignored, no matter if they are already present in the work
169tree or not.
170
Junio C Hamano535c65c2017-06-24 22:51:58171--no-warn-embedded-repo::
172By default, `git add` will warn when adding an embedded
173repository to the index without using `git submodule add` to
174create an entry in `.gitmodules`. This option will suppress the
175warning (e.g., if you are manually performing operations on
176submodules).
177
Junio C Hamano4886c772017-11-27 03:33:28178--renormalize::
179Apply the "clean" process freshly to all tracked files to
180forcibly add them again to the index. This is useful after
181changing `core.autocrlf` configuration or the `text` attribute
182in order to correct files added with wrong CRLF/LF line endings.
183This option implies `-u`.
184
Junio C Hamano53800482016-09-21 23:26:43185--chmod=(+|-)x::
186Override the executable bit of the added files. The executable
187bit is only changed in the index, the files on disk are left
188unchanged.
189
Junio C Hamano1bb569e2006-05-05 23:14:25190\--::
Junio C Hamano7e9f6b72006-02-22 10:44:55191This option can be used to separate command-line options from
192the list of files, (useful when filenames might be mistaken
193for command-line options).
194
Junio C Hamano1a4e8412005-12-27 08:17:23195
Junio C Hamano9fbd4f72007-05-18 15:54:37196Configuration
197-------------
198
Junio C Hamano322c6242015-03-23 21:32:46199The optional configuration variable `core.excludesFile` indicates a path to a
Junio C Hamano9fbd4f72007-05-18 15:54:37200file containing patterns of file names to exclude from git-add, similar to
201$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
Junio C Hamano4f07aec2012-09-25 19:08:44202those in info/exclude. See linkgit:gitignore[5].
Junio C Hamano9fbd4f72007-05-18 15:54:37203
204
Junio C Hamano1a4e8412005-12-27 08:17:23205EXAMPLES
206--------
Junio C Hamano1a4e8412005-12-27 08:17:23207
Junio C Hamano2db3e752010-09-03 21:33:06208* Adds content from all `*.txt` files under `Documentation` directory
Junio C Hamano6d76d612008-05-09 05:46:08209and its subdirectories:
210+
211------------
Junio C Hamano78b92a82010-02-09 07:34:13212$ git add Documentation/\*.txt
Junio C Hamano6d76d612008-05-09 05:46:08213------------
Junio C Hamano1a4e8412005-12-27 08:17:23214+
Junio C Hamano2db3e752010-09-03 21:33:06215Note that the asterisk `*` is quoted from the shell in this
Junio C Hamanof8a79222009-03-01 08:02:50216example; this lets the command include the files from
Junio C Hamano1a4e8412005-12-27 08:17:23217subdirectories of `Documentation/` directory.
218
Junio C Hamano6d76d612008-05-09 05:46:08219* Considers adding content from all git-*.sh scripts:
220+
221------------
222$ git add git-*.sh
223------------
224+
Junio C Hamanof8a79222009-03-01 08:02:50225Because this example lets the shell expand the asterisk (i.e. you are
Junio C Hamano6d76d612008-05-09 05:46:08226listing the files explicitly), it does not consider
227`subdir/git-foo.sh`.
Junio C Hamano1a4e8412005-12-27 08:17:23228
Junio C Hamano17bbaca2006-12-25 11:36:31229Interactive mode
230----------------
231When the command enters the interactive mode, it shows the
Junio C Hamanof9771f62007-01-17 17:42:30232output of the 'status' subcommand, and then goes into its
Junio C Hamano17bbaca2006-12-25 11:36:31233interactive command loop.
234
235The command loop shows the list of subcommands available, and
236gives a prompt "What now> ". In general, when the prompt ends
237with a single '>', you can pick only one of the choices given
238and type return, like this:
239
240------------
241 *** Commands ***
242 1: status 2: update 3: revert 4: add untracked
243 5: patch 6: diff 7: quit 8: help
244 What now> 1
245------------
246
Junio C Hamanoae05fee2010-01-08 07:39:46247You also could say `s` or `sta` or `status` above as long as the
Junio C Hamano17bbaca2006-12-25 11:36:31248choice is unique.
249
250The main command loop has 6 subcommands (plus help and quit).
251
252status::
253
254 This shows the change between HEAD and index (i.e. what will be
Junio C Hamanoae05fee2010-01-08 07:39:46255 committed if you say `git commit`), and between index and
Junio C Hamano17bbaca2006-12-25 11:36:31256 working tree files (i.e. what you could stage further before
Junio C Hamanoae05fee2010-01-08 07:39:46257 `git commit` using `git add`) for each path. A sample output
Junio C Hamano17bbaca2006-12-25 11:36:31258 looks like this:
259+
260------------
261 staged unstaged path
262 1: binary nothing foo.png
263 2: +403/-35 +1/-1 git-add--interactive.perl
264------------
265+
266It shows that foo.png has differences from HEAD (but that is
267binary so line count cannot be shown) and there is no
268difference between indexed copy and the working tree
269version (if the working tree version were also different,
270'binary' would have been shown in place of 'nothing'). The
Junio C Hamano2db3e752010-09-03 21:33:06271other file, git-add{litdd}interactive.perl, has 403 lines added
Junio C Hamano17bbaca2006-12-25 11:36:31272and 35 lines deleted if you commit what is in the index, but
273working tree file has further modifications (one addition and
274one deletion).
275
276update::
277
Junio C Hamanof8a79222009-03-01 08:02:50278 This shows the status information and issues an "Update>>"
279 prompt. When the prompt ends with double '>>', you can
Junio C Hamano17bbaca2006-12-25 11:36:31280 make more than one selection, concatenated with whitespace or
281 comma. Also you can say ranges. E.g. "2-5 7,9" to choose
Junio C Hamano38ddcce2008-07-15 15:49:03282 2,3,4,5,7,9 from the list. If the second number in a range is
283 omitted, all remaining patches are taken. E.g. "7-" to choose
284 7,8,9 from the list. You can say '*' to choose everything.
Junio C Hamano17bbaca2006-12-25 11:36:31285+
286What you chose are then highlighted with '*',
287like this:
288+
289------------
290 staged unstaged path
291 1: binary nothing foo.png
292* 2: +403/-35 +1/-1 git-add--interactive.perl
293------------
294+
295To remove selection, prefix the input with `-`
296like this:
297+
298------------
299Update>> -2
300------------
301+
302After making the selection, answer with an empty line to stage the
303contents of working tree files for selected paths in the index.
304
305revert::
306
307 This has a very similar UI to 'update', and the staged
308 information for selected paths are reverted to that of the
309 HEAD version. Reverting new paths makes them untracked.
310
311add untracked::
312
313 This has a very similar UI to 'update' and
314 'revert', and lets you add untracked paths to the index.
315
316patch::
317
Junio C Hamanof8a79222009-03-01 08:02:50318 This lets you choose one path out of a 'status' like selection.
319 After choosing the path, it presents the diff between the index
Junio C Hamano17bbaca2006-12-25 11:36:31320 and the working tree file and asks you if you want to stage
Junio C Hamano9eb58352011-05-11 20:09:24321 the change of each hunk. You can select one of the following
322 options and type return:
Junio C Hamano17bbaca2006-12-25 11:36:31323
Junio C Hamano8760ea62008-03-14 08:58:45324 y - stage this hunk
325 n - do not stage this hunk
Junio C Hamanod75148a2014-04-08 19:48:38326 q - quit; do not stage this hunk or any of the remaining ones
Junio C Hamanoa574a092010-06-13 19:57:10327 a - stage this hunk and all later hunks in the file
Junio C Hamanod75148a2014-04-08 19:48:38328 d - do not stage this hunk or any of the later hunks in the file
Junio C Hamano3bd66e92009-04-18 06:17:56329 g - select a hunk to go to
330 / - search for a hunk matching the given regex
Junio C Hamano8760ea62008-03-14 08:58:45331 j - leave this hunk undecided, see next undecided hunk
332 J - leave this hunk undecided, see next hunk
333 k - leave this hunk undecided, see previous undecided hunk
334 K - leave this hunk undecided, see previous hunk
Junio C Hamanoe0facb92007-12-05 10:59:48335 s - split the current hunk into smaller hunks
Junio C Hamano46a38aa2008-07-14 03:13:27336 e - manually edit the current hunk
Junio C Hamanoe0facb92007-12-05 10:59:48337 ? - print help
Junio C Hamano17bbaca2006-12-25 11:36:31338+
339After deciding the fate for all hunks, if there is any hunk
340that was chosen, the index is updated with the selected hunks.
Junio C Hamano9eb58352011-05-11 20:09:24341+
342You can omit having to type return here, by setting the configuration
Junio C Hamano322c6242015-03-23 21:32:46343variable `interactive.singleKey` to `true`.
Junio C Hamano17bbaca2006-12-25 11:36:31344
345diff::
346
347 This lets you review what will be committed (i.e. between
348 HEAD and index).
349
Junio C Hamano97bcb482010-11-25 03:16:07350
351EDITING PATCHES
352---------------
353
354Invoking `git add -e` or selecting `e` from the interactive hunk
355selector will open a patch in your editor; after the editor exits, the
356result is applied to the index. You are free to make arbitrary changes
357to the patch, but note that some changes may have confusing results, or
358even result in a patch that cannot be applied. If you want to abort the
359operation entirely (i.e., stage nothing new in the index), simply delete
360all lines of the patch. The list below describes some common things you
361may see in a patch, and which editing operations make sense on them.
362
363--
364added content::
365
366Added content is represented by lines beginning with "{plus}". You can
367prevent staging any addition lines by deleting them.
368
369removed content::
370
371Removed content is represented by lines beginning with "-". You can
372prevent staging their removal by converting the "-" to a " " (space).
373
374modified content::
375
376Modified content is represented by "-" lines (removing the old content)
377followed by "{plus}" lines (adding the replacement content). You can
378prevent staging the modification by converting "-" lines to " ", and
379removing "{plus}" lines. Beware that modifying only half of the pair is
380likely to introduce confusing changes to the index.
381--
382
383There are also more complex operations that can be performed. But beware
384that because the patch is applied only to the index and not the working
385tree, the working tree will appear to "undo" the change in the index.
Junio C Hamano7165bf72011-01-04 22:06:18386For example, introducing a new line into the index that is in neither
Junio C Hamano97bcb482010-11-25 03:16:07387the HEAD nor the working tree will stage the new line for commit, but
388the line will appear to be reverted in the working tree.
389
390Avoid using these constructs, or do so with extreme caution.
391
392--
393removing untouched content::
394
395Content which does not differ between the index and working tree may be
396shown on context lines, beginning with a " " (space). You can stage
397context lines for removal by converting the space to a "-". The
398resulting working tree file will appear to re-add the content.
399
400modifying existing content::
401
402One can also modify context lines by staging them for removal (by
403converting " " to "-") and adding a "{plus}" line with the new content.
404Similarly, one can modify "{plus}" lines for existing additions or
405modifications. In all cases, the new modification will appear reverted
406in the working tree.
407
408new content::
409
410You may also add new content that does not exist in the patch; simply
411add new lines, each starting with "{plus}". The addition will appear
412reverted in the working tree.
413--
414
415There are also several operations which should be avoided entirely, as
416they will make the patch impossible to apply:
417
418* adding context (" ") or removal ("-") lines
419* deleting context or removal lines
420* modifying the contents of context or removal lines
421
Junio C Hamano9049d912008-05-29 02:09:50422SEE ALSO
Junio C Hamano2bb13102006-03-06 07:10:21423--------
Junio C Hamano35738e82008-01-07 07:55:46424linkgit:git-status[1]
425linkgit:git-rm[1]
426linkgit:git-reset[1]
427linkgit:git-mv[1]
428linkgit:git-commit[1]
429linkgit:git-update-index[1]
Junio C Hamano1a4e8412005-12-27 08:17:23430
Junio C Hamano1a4e8412005-12-27 08:17:23431GIT
432---
Junio C Hamanof7c042d2008-06-06 22:50:53433Part of the linkgit:git[1] suite