blob: 37bcab94d5e435849c22ddd0473be5cfb1c56140 [file] [log] [blame]
Junio C Hamano215a7ad2005-09-07 17:26:23 -07001git-add(1)
2==========
Junio C Hamano7fc9d692005-08-23 01:49:47 -07003
4NAME
5----
J. Bruce Fields5f42ac92007-08-05 19:16:09 -04006git-add - Add file contents to the index
Junio C Hamano7fc9d692005-08-23 01:49:47 -07007
8SYNOPSIS
9--------
Brian Hetro480611d2007-08-25 23:20:06 -040010[verse]
Alexander Kuleshova2681d22015-01-09 13:48:40 +060011'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]
Junio C Hamano9f60f492013-04-22 13:29:20 -070012 [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]
Torsten Bögershausen94729352017-11-16 17:38:28 +010013 [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]
Thomas Gummerer7ef79032016-09-12 22:08:15 +010014 [--chmod=(+|-)x] [--] [<pathspec>...]
Junio C Hamano7fc9d692005-08-23 01:49:47 -070015
16DESCRIPTION
17-----------
Björn Gustavsson968d7072009-12-07 09:20:09 +010018This 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 Hamano810bf1f2005-11-04 00:04:17 -080024
J. Bruce Fields5f42ac92007-08-05 19:16:09 -040025The "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
Lars Vogelbd02e972016-01-21 11:09:15 +010027after making any changes to the working tree, and before running
Björn Gustavsson441947f2009-12-07 19:26:57 +010028the commit command, you must use the `add` command to add any new or
J. Bruce Fields5f42ac92007-08-05 19:16:09 -040029modified files to the index.
Nicolas Pitre366bfcb2006-12-04 11:13:39 -050030
J. Bruce Fields5f42ac92007-08-05 19:16:09 -040031This 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
Björn Gustavsson441947f2009-12-07 19:26:57 +010034you must run `git add` again to add the new content to the index.
Nicolas Pitre366bfcb2006-12-04 11:13:39 -050035
Björn Gustavsson441947f2009-12-07 19:26:57 +010036The `git status` command can be used to obtain a summary of which
J. Bruce Fields5f42ac92007-08-05 19:16:09 -040037files have changes that are staged for the next commit.
38
Björn Gustavsson441947f2009-12-07 19:26:57 +010039The `git add` command will not add ignored files by default. If any
40ignored files were explicitly specified on the command line, `git add`
Brian Downingd1d028e2007-08-16 17:56:08 -050041will fail with a list of ignored files. Ignored files reached by
Petr Baudis9d5fc592007-08-29 00:41:28 +020042directory recursion or filename globbing performed by Git (quote your
Thomas Rastca768282010-01-07 17:49:12 +010043globs before the shell) will be silently ignored. The 'git add' command can
Petr Baudis9d5fc592007-08-29 00:41:28 +020044be used to add ignored files with the `-f` (force) option.
Junio C Hamano7fc9d692005-08-23 01:49:47 -070045
Dan McGee5162e692007-12-29 00:20:38 -060046Please see linkgit:git-commit[1] for alternative ways to add content to a
Nicolas Pitre366bfcb2006-12-04 11:13:39 -050047commit.
48
49
Junio C Hamano7fc9d692005-08-23 01:49:47 -070050OPTIONS
51-------
Matthieu Moyd32805d2013-02-12 10:24:44 +010052<pathspec>...::
Junio C Hamanoe23ca9e2006-12-25 03:13:45 -080053 Files to add content from. Fileglobs (e.g. `*.c`) can
54 be given to add all matching files. Also a
55 leading directory name (e.g. `dir` to add `dir/file1`
Junio C Hamanofdc97ab2013-04-22 14:30:22 -070056 and `dir/file2`) can be given to update the index to
57 match the current state of the directory as a whole (e.g.
58 specifying `dir` will record not just a file `dir/file1`
59 modified in the working tree, a file `dir/file2` added to
60 the working tree, but also a file `dir/file3` removed from
Jean-Noël Avilaba170512019-01-22 21:16:35 +010061 the working tree). Note that older versions of Git used
Junio C Hamanofdc97ab2013-04-22 14:30:22 -070062 to ignore removed files; use `--no-all` option if you want
Jean-Noël Avilaba170512019-01-22 21:16:35 +010063 to add modified or new files but ignore removed ones.
Manav Rathi93dbefb2017-09-25 13:39:00 +053064+
65For more details about the <pathspec> syntax, see the 'pathspec' entry
66in linkgit:gitglossary[7].
Junio C Hamano7fc9d692005-08-23 01:49:47 -070067
Stephan Beyer32402402008-06-08 03:36:09 +020068-n::
69--dry-run::
Jens Lehmann108da0d2010-07-10 00:18:38 +020070 Don't actually add the file(s), just show if they exist and/or will
71 be ignored.
Chris Shoemaker918db542005-10-29 17:46:41 -040072
Stephan Beyer32402402008-06-08 03:36:09 +020073-v::
74--verbose::
Chris Shoemaker918db542005-10-29 17:46:41 -040075 Be verbose.
76
Junio C Hamano6a1ad322006-12-25 17:46:38 -080077-f::
SZEDER Gábor69c61c42008-06-14 11:48:00 +020078--force::
Junio C Hamano6a1ad322006-12-25 17:46:38 -080079 Allow adding otherwise ignored files.
80
Stephan Beyer32402402008-06-08 03:36:09 +020081-i::
82--interactive::
Junio C Hamano6a5ad232006-12-25 01:30:55 -080083 Add modified contents in the working tree interactively to
Wincent Colaiutab63e9952007-11-25 14:15:42 +010084 the index. Optional path arguments may be supplied to limit
85 operation to a subset of the working tree. See ``Interactive
86 mode'' for details.
87
Stephan Beyer32402402008-06-08 03:36:09 +020088-p::
89--patch::
Jari Aalto5f2b1e62009-09-13 09:43:10 +030090 Interactively choose hunks of patch between the index and the
91 work tree and add them to the index. This gives the user a chance
92 to review the difference before adding modified contents to the
93 index.
Stephen Boyd46ada612009-11-13 17:45:46 -080094+
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 Hamano6a5ad232006-12-25 01:30:55 -080098
Jeff King0a3ca9c2015-05-13 00:58:51 -040099-e::
100--edit::
Johannes Schindelinc59cb032009-04-08 23:30:24 +0200101 Open the diff vs. the index in an editor and let the user
102 edit it. After the editor was closed, adjust the hunk headers
103 and apply the patch to the index.
104+
Jeff King5df4d672010-10-21 10:30:35 -0400105The intent of this option is to pick and choose lines of the patch to
Jeff King0fe802d2010-11-08 23:58:20 -0500106apply, 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.
Johannes Schindelinc59cb032009-04-08 23:30:24 +0200110
Matthieu Moybc3561f2007-05-06 23:11:55 +0200111-u::
SZEDER Gábor69c61c42008-06-14 11:48:00 +0200112--update::
Greg Price5cae9352013-03-07 05:13:15 -0500113 Update the index just where it already has an entry matching
114 <pathspec>. This removes as well as modifies index entries to
115 match the working tree, but adds no new files.
Björn Gustavsson968d7072009-12-07 09:20:09 +0100116+
Junio C Hamano808d3d72013-03-19 15:53:17 -0700117If 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).
Matthieu Moybc3561f2007-05-06 23:11:55 +0200121
Junio C Hamanoda980532008-07-19 22:34:16 -0700122-A::
123--all::
Junio C Hamano9f60f492013-04-22 13:29:20 -0700124--no-ignore-removal::
Greg Price5cae9352013-03-07 05:13:15 -0500125 Update the index not only where the working tree has a file
126 matching <pathspec> but also where the index already has an
Jean-Noël Avilaba170512019-01-22 21:16:35 +0100127 entry. This adds, modifies, and removes index entries to
Greg Price5cae9352013-03-07 05:13:15 -0500128 match the working tree.
129+
Junio C Hamano808d3d72013-03-19 15:53:17 -0700130If 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).
Jeff King8776f5d2008-10-20 20:36:25 -0400134
Junio C Hamano45c45e32011-04-19 12:18:20 -0700135--no-all::
Junio C Hamano9f60f492013-04-22 13:29:20 -0700136--ignore-removal::
Junio C Hamano45c45e32011-04-19 12:18:20 -0700137 Update the index by adding new files that are unknown to the
138 index and files modified in the working tree, but ignore
139 files that have been removed from the working tree. This
140 option is a no-op when no <pathspec> is used.
141+
Junio C Hamanofdc97ab2013-04-22 14:30:22 -0700142This 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 Hamano45c45e32011-04-19 12:18:20 -0700145
Jeff King8776f5d2008-10-20 20:36:25 -0400146-N::
147--intent-to-add::
148 Record only the fact that the path will be added later. An entry
149 for the path is placed in the index with no content. This is
150 useful for, among other things, showing the unstaged content of
Björn Gustavsson441947f2009-12-07 19:26:57 +0100151 such files with `git diff` and committing them with `git commit
152 -a`.
Jeff King8776f5d2008-10-20 20:36:25 -0400153
Stephan Beyer32402402008-06-08 03:36:09 +0200154--refresh::
Alexandre Julliardd6168132007-08-11 23:59:01 +0200155 Don't add the file(s), but only refresh their stat()
156 information in the index.
157
Stephan Beyer32402402008-06-08 03:36:09 +0200158--ignore-errors::
Alex Riesen984b83e2008-05-12 19:58:29 +0200159 If some files could not be added because of errors indexing
160 them, do not abort the operation, but continue adding the
161 others. The command shall still exit with non-zero status.
Valentin Haeneld0224432011-05-04 21:58:17 +0200162 The configuration variable `add.ignoreErrors` can be set to
163 true to make this the default behaviour.
Alex Riesen984b83e2008-05-12 19:58:29 +0200164
Jens Lehmann108da0d2010-07-10 00:18:38 +0200165--ignore-missing::
166 This option can only be used together with --dry-run. By using
167 this option the user can check if any of the given files would
168 be ignored, no matter if they are already present in the work
169 tree or not.
170
Jeff King53213992017-06-14 06:58:22 -0400171--no-warn-embedded-repo::
172 By default, `git add` will warn when adding an embedded
173 repository to the index without using `git submodule add` to
174 create an entry in `.gitmodules`. This option will suppress the
175 warning (e.g., if you are manually performing operations on
176 submodules).
177
Torsten Bögershausen94729352017-11-16 17:38:28 +0100178--renormalize::
179 Apply the "clean" process freshly to all tracked files to
180 forcibly add them again to the index. This is useful after
181 changing `core.autocrlf` configuration or the `text` attribute
182 in order to correct files added with wrong CRLF/LF line endings.
183 This option implies `-u`.
184
Thomas Gummerer7ef79032016-09-12 22:08:15 +0100185--chmod=(+|-)x::
186 Override the executable bit of the added files. The executable
187 bit is only changed in the index, the files on disk are left
188 unchanged.
189
seane9940042006-05-05 15:05:24 -0400190\--::
Carl Worth60ace872006-02-21 15:33:49 -0800191 This option can be used to separate command-line options from
192 the list of files, (useful when filenames might be mistaken
193 for command-line options).
194
Chris Shoemaker918db542005-10-29 17:46:41 -0400195
Nguyễn Thái Ngọc Duy76a87882018-04-30 17:35:33 +0200196CONFIGURATION
Michael Hendricks164b1982007-05-16 23:08:50 -0600197-------------
198
Nguyễn Thái Ngọc Duyda0005b2015-03-11 16:32:45 -0400199The optional configuration variable `core.excludesFile` indicates a path to a
Michael Hendricks164b1982007-05-16 23:08:50 -0600200file 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
Philip Oakleya73d3792012-09-19 00:25:32 +0100202those in info/exclude. See linkgit:gitignore[5].
Michael Hendricks164b1982007-05-16 23:08:50 -0600203
204
Junio C Hamano810bf1f2005-11-04 00:04:17 -0800205EXAMPLES
206--------
Junio C Hamano810bf1f2005-11-04 00:04:17 -0800207
Jonathan Nieder1b6c6cf2010-08-20 05:26:13 -0500208* Adds content from all `*.txt` files under `Documentation` directory
Jean-Noël Avilaba170512019-01-22 21:16:35 +0100209 and its subdirectories:
Christian Couder921177f2008-05-07 06:29:28 +0200210+
211------------
Junio C Hamanobf7cbb22010-02-08 12:12:41 -0800212$ git add Documentation/\*.txt
Christian Couder921177f2008-05-07 06:29:28 +0200213------------
Junio C Hamano810bf1f2005-11-04 00:04:17 -0800214+
Jonathan Nieder1b6c6cf2010-08-20 05:26:13 -0500215Note that the asterisk `*` is quoted from the shell in this
David J. Mellordcc901b2009-02-28 13:12:59 -0800216example; this lets the command include the files from
Junio C Hamano810bf1f2005-11-04 00:04:17 -0800217subdirectories of `Documentation/` directory.
218
Christian Couder921177f2008-05-07 06:29:28 +0200219* Considers adding content from all git-*.sh scripts:
220+
221------------
222$ git add git-*.sh
223------------
224+
David J. Mellordcc901b2009-02-28 13:12:59 -0800225Because this example lets the shell expand the asterisk (i.e. you are
Christian Couder921177f2008-05-07 06:29:28 +0200226listing the files explicitly), it does not consider
227`subdir/git-foo.sh`.
Junio C Hamano810bf1f2005-11-04 00:04:17 -0800228
Nguyễn Thái Ngọc Duy76a87882018-04-30 17:35:33 +0200229INTERACTIVE MODE
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800230----------------
231When the command enters the interactive mode, it shows the
René Scharfe23bfbb82007-01-17 16:32:41 +0100232output of the 'status' subcommand, and then goes into its
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800233interactive 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
Björn Gustavsson441947f2009-12-07 19:26:57 +0100247You also could say `s` or `sta` or `status` above as long as the
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800248choice 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
Björn Gustavsson441947f2009-12-07 19:26:57 +0100255 committed if you say `git commit`), and between index and
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800256 working tree files (i.e. what you could stage further before
Björn Gustavsson441947f2009-12-07 19:26:57 +0100257 `git commit` using `git add`) for each path. A sample output
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800258 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 Hamano28394782010-08-23 14:20:25 -0700271other file, git-add{litdd}interactive.perl, has 403 lines added
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800272and 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
David J. Mellordcc901b2009-02-28 13:12:59 -0800278 This shows the status information and issues an "Update>>"
279 prompt. When the prompt ends with double '>>', you can
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800280 make more than one selection, concatenated with whitespace or
281 comma. Also you can say ranges. E.g. "2-5 7,9" to choose
Ciaran McCreesh1e5aaa62008-07-14 19:29:37 +0100282 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 Hamano6a5ad232006-12-25 01:30:55 -0800285+
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
David J. Mellordcc901b2009-02-28 13:12:59 -0800318 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 Hamano6a5ad232006-12-25 01:30:55 -0800320 and the working tree file and asks you if you want to stage
Valentin Haenelc1053562011-05-05 20:48:45 +0200321 the change of each hunk. You can select one of the following
322 options and type return:
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800323
Vineet Kumarbb12ac52008-03-13 11:32:16 -0700324 y - stage this hunk
325 n - do not stage this hunk
Justin Lebara58088a2014-03-31 15:11:44 -0700326 q - quit; do not stage this hunk or any of the remaining ones
Jonathan Nieder74e42ce2010-06-12 22:32:51 -0500327 a - stage this hunk and all later hunks in the file
Justin Lebara58088a2014-03-31 15:11:44 -0700328 d - do not stage this hunk or any of the later hunks in the file
Matthieu Moy595f6942009-04-16 18:46:23 +0200329 g - select a hunk to go to
330 / - search for a hunk matching the given regex
Vineet Kumarbb12ac52008-03-13 11:32:16 -0700331 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
Ralf Wildenhues280e50c2007-11-28 19:21:42 +0100335 s - split the current hunk into smaller hunks
Thomas Rastac083c42008-07-03 00:00:00 +0200336 e - manually edit the current hunk
Ralf Wildenhues280e50c2007-11-28 19:21:42 +0100337 ? - print help
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800338+
339After deciding the fate for all hunks, if there is any hunk
340that was chosen, the index is updated with the selected hunks.
Valentin Haenelc1053562011-05-05 20:48:45 +0200341+
342You can omit having to type return here, by setting the configuration
Nguyễn Thái Ngọc Duyda0005b2015-03-11 16:32:45 -0400343variable `interactive.singleKey` to `true`.
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800344
345diff::
346
347 This lets you review what will be committed (i.e. between
348 HEAD and index).
349
Jeff King0fe802d2010-11-08 23:58:20 -0500350
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.
Ralf Wildenhues469bfc92011-01-03 20:03:34 +0100386For example, introducing a new line into the index that is in neither
Jeff King0fe802d2010-11-08 23:58:20 -0500387the 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 Hamano56ae8df2008-05-28 16:55:27 -0700422SEE ALSO
Jeff Muizelaar872d0012006-03-05 16:18:19 -0500423--------
Dan McGee5162e692007-12-29 00:20:38 -0600424linkgit: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 Hamano810bf1f2005-11-04 00:04:17 -0800430
Junio C Hamano7fc9d692005-08-23 01:49:47 -0700431GIT
432---
Christian Couder9e1f0a82008-06-06 09:07:32 +0200433Part of the linkgit:git[1] suite