blob: 7ed63dce0b1f55325497b4fd6879422fe119eaf5 [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]]
13 [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing]
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 Hamano1a4e8412005-12-27 08:17:2364
Junio C Hamanoeb415992008-06-08 22:49:4765-n::
66--dry-run::
Junio C Hamanoafabd322010-07-19 20:26:1567Don't actually add the file(s), just show if they exist and/or will
68be ignored.
Junio C Hamano1a4e8412005-12-27 08:17:2369
Junio C Hamanoeb415992008-06-08 22:49:4770-v::
71--verbose::
Junio C Hamano1a4e8412005-12-27 08:17:2372 Be verbose.
73
Junio C Hamano3d2adc72006-12-26 03:21:4574-f::
Junio C Hamano00e884a2008-06-15 05:10:3875--force::
Junio C Hamano3d2adc72006-12-26 03:21:4576Allow adding otherwise ignored files.
77
Junio C Hamanoeb415992008-06-08 22:49:4778-i::
79--interactive::
Junio C Hamano17bbaca2006-12-25 11:36:3180Add modified contents in the working tree interactively to
Junio C Hamanoe0facb92007-12-05 10:59:4881the index. Optional path arguments may be supplied to limit
82operation to a subset of the working tree. See ``Interactive
83mode'' for details.
84
Junio C Hamanoeb415992008-06-08 22:49:4785-p::
86--patch::
Junio C Hamano7df6dcf2009-09-13 09:51:1787Interactively choose hunks of patch between the index and the
88work tree and add them to the index. This gives the user a chance
89to review the difference before adding modified contents to the
90index.
Junio C Hamanoe1b26832009-11-15 10:02:5691+
92This effectively runs `add --interactive`, but bypasses the
93initial command menu and directly jumps to the `patch` subcommand.
94See ``Interactive mode'' for details.
Junio C Hamano17bbaca2006-12-25 11:36:3195
Junio C Hamano1dbca522015-05-22 20:48:5596-e::
97--edit::
Junio C Hamano52ba2952009-05-18 17:43:0298Open the diff vs. the index in an editor and let the user
99edit it. After the editor was closed, adjust the hunk headers
100and apply the patch to the index.
101+
Junio C Hamano97bcb482010-11-25 03:16:07102The intent of this option is to pick and choose lines of the patch to
103apply, or even to modify the contents of lines to be staged. This can be
104quicker and more flexible than using the interactive hunk selector.
105However, it is easy to confuse oneself and create a patch that does not
106apply to the index. See EDITING PATCHES below.
Junio C Hamano52ba2952009-05-18 17:43:02107
Junio C Hamano3d30fd52007-05-08 00:32:53108-u::
Junio C Hamano00e884a2008-06-15 05:10:38109--update::
Junio C Hamanof66c4632013-03-11 20:54:25110Update the index just where it already has an entry matching
111<pathspec>. This removes as well as modifies index entries to
112match the working tree, but adds no new files.
Junio C Hamanoae05fee2010-01-08 07:39:46113+
Junio C Hamano1d669b82014-03-11 21:36:00114If no <pathspec> is given when `-u` option is used, all
115tracked files in the entire working tree are updated (old versions
116of Git used to limit the update to the current directory and its
117subdirectories).
Junio C Hamano3d30fd52007-05-08 00:32:53118
Junio C Hamano5ba2c222008-07-21 04:33:46119-A::
120--all::
Junio C Hamanof26c77e2013-04-27 00:06:04121--no-ignore-removal::
Junio C Hamanof66c4632013-03-11 20:54:25122Update the index not only where the working tree has a file
123matching <pathspec> but also where the index already has an
124entry. This adds, modifies, and removes index entries to
125match the working tree.
126+
Junio C Hamano1d669b82014-03-11 21:36:00127If no <pathspec> is given when `-A` option is used, all
128files in the entire working tree are updated (old versions
129of Git used to limit the update to the current directory and its
130subdirectories).
Junio C Hamano845880c2008-10-21 19:04:45131
Junio C Hamanoc79bc672013-04-22 19:12:47132--no-all::
Junio C Hamanof26c77e2013-04-27 00:06:04133--ignore-removal::
Junio C Hamanoc79bc672013-04-22 19:12:47134Update the index by adding new files that are unknown to the
135index and files modified in the working tree, but ignore
136files that have been removed from the working tree. This
137option is a no-op when no <pathspec> is used.
138+
Junio C Hamano1d669b82014-03-11 21:36:00139This option is primarily to help users who are used to older
140versions of Git, whose "git add <pathspec>..." was a synonym
141for "git add --no-all <pathspec>...", i.e. ignored removed files.
Junio C Hamanoc79bc672013-04-22 19:12:47142
Junio C Hamano845880c2008-10-21 19:04:45143-N::
144--intent-to-add::
145Record only the fact that the path will be added later. An entry
146for the path is placed in the index with no content. This is
147useful for, among other things, showing the unstaged content of
Junio C Hamanoae05fee2010-01-08 07:39:46148such files with `git diff` and committing them with `git commit
149-a`.
Junio C Hamano845880c2008-10-21 19:04:45150
Junio C Hamanoeb415992008-06-08 22:49:47151--refresh::
Junio C Hamano024b6c62007-08-14 09:43:08152Don't add the file(s), but only refresh their stat()
153information in the index.
154
Junio C Hamanoeb415992008-06-08 22:49:47155--ignore-errors::
Junio C Hamanofeeb1be2008-05-22 00:53:35156If some files could not be added because of errors indexing
157them, do not abort the operation, but continue adding the
158others. The command shall still exit with non-zero status.
Junio C Hamanob77f8192011-05-05 01:30:38159The configuration variable `add.ignoreErrors` can be set to
160true to make this the default behaviour.
Junio C Hamanofeeb1be2008-05-22 00:53:35161
Junio C Hamanoafabd322010-07-19 20:26:15162--ignore-missing::
163This option can only be used together with --dry-run. By using
164this option the user can check if any of the given files would
165be ignored, no matter if they are already present in the work
166tree or not.
167
Junio C Hamano53800482016-09-21 23:26:43168--chmod=(+|-)x::
169Override the executable bit of the added files. The executable
170bit is only changed in the index, the files on disk are left
171unchanged.
172
Junio C Hamano1bb569e2006-05-05 23:14:25173\--::
Junio C Hamano7e9f6b72006-02-22 10:44:55174This option can be used to separate command-line options from
175the list of files, (useful when filenames might be mistaken
176for command-line options).
177
Junio C Hamano1a4e8412005-12-27 08:17:23178
Junio C Hamano9fbd4f72007-05-18 15:54:37179Configuration
180-------------
181
Junio C Hamano322c6242015-03-23 21:32:46182The optional configuration variable `core.excludesFile` indicates a path to a
Junio C Hamano9fbd4f72007-05-18 15:54:37183file containing patterns of file names to exclude from git-add, similar to
184$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
Junio C Hamano4f07aec2012-09-25 19:08:44185those in info/exclude. See linkgit:gitignore[5].
Junio C Hamano9fbd4f72007-05-18 15:54:37186
187
Junio C Hamano1a4e8412005-12-27 08:17:23188EXAMPLES
189--------
Junio C Hamano1a4e8412005-12-27 08:17:23190
Junio C Hamano2db3e752010-09-03 21:33:06191* Adds content from all `*.txt` files under `Documentation` directory
Junio C Hamano6d76d612008-05-09 05:46:08192and its subdirectories:
193+
194------------
Junio C Hamano78b92a82010-02-09 07:34:13195$ git add Documentation/\*.txt
Junio C Hamano6d76d612008-05-09 05:46:08196------------
Junio C Hamano1a4e8412005-12-27 08:17:23197+
Junio C Hamano2db3e752010-09-03 21:33:06198Note that the asterisk `*` is quoted from the shell in this
Junio C Hamanof8a79222009-03-01 08:02:50199example; this lets the command include the files from
Junio C Hamano1a4e8412005-12-27 08:17:23200subdirectories of `Documentation/` directory.
201
Junio C Hamano6d76d612008-05-09 05:46:08202* Considers adding content from all git-*.sh scripts:
203+
204------------
205$ git add git-*.sh
206------------
207+
Junio C Hamanof8a79222009-03-01 08:02:50208Because this example lets the shell expand the asterisk (i.e. you are
Junio C Hamano6d76d612008-05-09 05:46:08209listing the files explicitly), it does not consider
210`subdir/git-foo.sh`.
Junio C Hamano1a4e8412005-12-27 08:17:23211
Junio C Hamano17bbaca2006-12-25 11:36:31212Interactive mode
213----------------
214When the command enters the interactive mode, it shows the
Junio C Hamanof9771f62007-01-17 17:42:30215output of the 'status' subcommand, and then goes into its
Junio C Hamano17bbaca2006-12-25 11:36:31216interactive command loop.
217
218The command loop shows the list of subcommands available, and
219gives a prompt "What now> ". In general, when the prompt ends
220with a single '>', you can pick only one of the choices given
221and type return, like this:
222
223------------
224 *** Commands ***
225 1: status 2: update 3: revert 4: add untracked
226 5: patch 6: diff 7: quit 8: help
227 What now> 1
228------------
229
Junio C Hamanoae05fee2010-01-08 07:39:46230You also could say `s` or `sta` or `status` above as long as the
Junio C Hamano17bbaca2006-12-25 11:36:31231choice is unique.
232
233The main command loop has 6 subcommands (plus help and quit).
234
235status::
236
237 This shows the change between HEAD and index (i.e. what will be
Junio C Hamanoae05fee2010-01-08 07:39:46238 committed if you say `git commit`), and between index and
Junio C Hamano17bbaca2006-12-25 11:36:31239 working tree files (i.e. what you could stage further before
Junio C Hamanoae05fee2010-01-08 07:39:46240 `git commit` using `git add`) for each path. A sample output
Junio C Hamano17bbaca2006-12-25 11:36:31241 looks like this:
242+
243------------
244 staged unstaged path
245 1: binary nothing foo.png
246 2: +403/-35 +1/-1 git-add--interactive.perl
247------------
248+
249It shows that foo.png has differences from HEAD (but that is
250binary so line count cannot be shown) and there is no
251difference between indexed copy and the working tree
252version (if the working tree version were also different,
253'binary' would have been shown in place of 'nothing'). The
Junio C Hamano2db3e752010-09-03 21:33:06254other file, git-add{litdd}interactive.perl, has 403 lines added
Junio C Hamano17bbaca2006-12-25 11:36:31255and 35 lines deleted if you commit what is in the index, but
256working tree file has further modifications (one addition and
257one deletion).
258
259update::
260
Junio C Hamanof8a79222009-03-01 08:02:50261 This shows the status information and issues an "Update>>"
262 prompt. When the prompt ends with double '>>', you can
Junio C Hamano17bbaca2006-12-25 11:36:31263 make more than one selection, concatenated with whitespace or
264 comma. Also you can say ranges. E.g. "2-5 7,9" to choose
Junio C Hamano38ddcce2008-07-15 15:49:03265 2,3,4,5,7,9 from the list. If the second number in a range is
266 omitted, all remaining patches are taken. E.g. "7-" to choose
267 7,8,9 from the list. You can say '*' to choose everything.
Junio C Hamano17bbaca2006-12-25 11:36:31268+
269What you chose are then highlighted with '*',
270like this:
271+
272------------
273 staged unstaged path
274 1: binary nothing foo.png
275* 2: +403/-35 +1/-1 git-add--interactive.perl
276------------
277+
278To remove selection, prefix the input with `-`
279like this:
280+
281------------
282Update>> -2
283------------
284+
285After making the selection, answer with an empty line to stage the
286contents of working tree files for selected paths in the index.
287
288revert::
289
290 This has a very similar UI to 'update', and the staged
291 information for selected paths are reverted to that of the
292 HEAD version. Reverting new paths makes them untracked.
293
294add untracked::
295
296 This has a very similar UI to 'update' and
297 'revert', and lets you add untracked paths to the index.
298
299patch::
300
Junio C Hamanof8a79222009-03-01 08:02:50301 This lets you choose one path out of a 'status' like selection.
302 After choosing the path, it presents the diff between the index
Junio C Hamano17bbaca2006-12-25 11:36:31303 and the working tree file and asks you if you want to stage
Junio C Hamano9eb58352011-05-11 20:09:24304 the change of each hunk. You can select one of the following
305 options and type return:
Junio C Hamano17bbaca2006-12-25 11:36:31306
Junio C Hamano8760ea62008-03-14 08:58:45307 y - stage this hunk
308 n - do not stage this hunk
Junio C Hamanod75148a2014-04-08 19:48:38309 q - quit; do not stage this hunk or any of the remaining ones
Junio C Hamanoa574a092010-06-13 19:57:10310 a - stage this hunk and all later hunks in the file
Junio C Hamanod75148a2014-04-08 19:48:38311 d - do not stage this hunk or any of the later hunks in the file
Junio C Hamano3bd66e92009-04-18 06:17:56312 g - select a hunk to go to
313 / - search for a hunk matching the given regex
Junio C Hamano8760ea62008-03-14 08:58:45314 j - leave this hunk undecided, see next undecided hunk
315 J - leave this hunk undecided, see next hunk
316 k - leave this hunk undecided, see previous undecided hunk
317 K - leave this hunk undecided, see previous hunk
Junio C Hamanoe0facb92007-12-05 10:59:48318 s - split the current hunk into smaller hunks
Junio C Hamano46a38aa2008-07-14 03:13:27319 e - manually edit the current hunk
Junio C Hamanoe0facb92007-12-05 10:59:48320 ? - print help
Junio C Hamano17bbaca2006-12-25 11:36:31321+
322After deciding the fate for all hunks, if there is any hunk
323that was chosen, the index is updated with the selected hunks.
Junio C Hamano9eb58352011-05-11 20:09:24324+
325You can omit having to type return here, by setting the configuration
Junio C Hamano322c6242015-03-23 21:32:46326variable `interactive.singleKey` to `true`.
Junio C Hamano17bbaca2006-12-25 11:36:31327
328diff::
329
330 This lets you review what will be committed (i.e. between
331 HEAD and index).
332
Junio C Hamano97bcb482010-11-25 03:16:07333
334EDITING PATCHES
335---------------
336
337Invoking `git add -e` or selecting `e` from the interactive hunk
338selector will open a patch in your editor; after the editor exits, the
339result is applied to the index. You are free to make arbitrary changes
340to the patch, but note that some changes may have confusing results, or
341even result in a patch that cannot be applied. If you want to abort the
342operation entirely (i.e., stage nothing new in the index), simply delete
343all lines of the patch. The list below describes some common things you
344may see in a patch, and which editing operations make sense on them.
345
346--
347added content::
348
349Added content is represented by lines beginning with "{plus}". You can
350prevent staging any addition lines by deleting them.
351
352removed content::
353
354Removed content is represented by lines beginning with "-". You can
355prevent staging their removal by converting the "-" to a " " (space).
356
357modified content::
358
359Modified content is represented by "-" lines (removing the old content)
360followed by "{plus}" lines (adding the replacement content). You can
361prevent staging the modification by converting "-" lines to " ", and
362removing "{plus}" lines. Beware that modifying only half of the pair is
363likely to introduce confusing changes to the index.
364--
365
366There are also more complex operations that can be performed. But beware
367that because the patch is applied only to the index and not the working
368tree, the working tree will appear to "undo" the change in the index.
Junio C Hamano7165bf72011-01-04 22:06:18369For example, introducing a new line into the index that is in neither
Junio C Hamano97bcb482010-11-25 03:16:07370the HEAD nor the working tree will stage the new line for commit, but
371the line will appear to be reverted in the working tree.
372
373Avoid using these constructs, or do so with extreme caution.
374
375--
376removing untouched content::
377
378Content which does not differ between the index and working tree may be
379shown on context lines, beginning with a " " (space). You can stage
380context lines for removal by converting the space to a "-". The
381resulting working tree file will appear to re-add the content.
382
383modifying existing content::
384
385One can also modify context lines by staging them for removal (by
386converting " " to "-") and adding a "{plus}" line with the new content.
387Similarly, one can modify "{plus}" lines for existing additions or
388modifications. In all cases, the new modification will appear reverted
389in the working tree.
390
391new content::
392
393You may also add new content that does not exist in the patch; simply
394add new lines, each starting with "{plus}". The addition will appear
395reverted in the working tree.
396--
397
398There are also several operations which should be avoided entirely, as
399they will make the patch impossible to apply:
400
401* adding context (" ") or removal ("-") lines
402* deleting context or removal lines
403* modifying the contents of context or removal lines
404
Junio C Hamano9049d912008-05-29 02:09:50405SEE ALSO
Junio C Hamano2bb13102006-03-06 07:10:21406--------
Junio C Hamano35738e82008-01-07 07:55:46407linkgit:git-status[1]
408linkgit:git-rm[1]
409linkgit:git-reset[1]
410linkgit:git-mv[1]
411linkgit:git-commit[1]
412linkgit:git-update-index[1]
Junio C Hamano1a4e8412005-12-27 08:17:23413
Junio C Hamano1a4e8412005-12-27 08:17:23414GIT
415---
Junio C Hamanof7c042d2008-06-06 22:50:53416Part of the linkgit:git[1] suite