blob: 9c1d3957223355e00eea917d4a7dff6d50343f32 [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 Hamanofce7c7e2008-07-02 03:06:3811'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
Junio C Hamano52ba2952009-05-18 17:43:0212 [--edit | -e] [--all | [--update | -u]] [--intent-to-add | -N]
Junio C Hamanoafabd322010-07-19 20:26:1513 [--refresh] [--ignore-errors] [--ignore-missing] [--]
14 [<filepattern>...]
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
27after making any changes to the working directory, 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 Hamano8b8b0f22007-08-26 22:10:2652<filepattern>...::
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`
56and `dir/file2`) can be given to add all files in the
57directory, recursively.
Junio C Hamano1a4e8412005-12-27 08:17:2358
Junio C Hamanoeb415992008-06-08 22:49:4759-n::
60--dry-run::
Junio C Hamanoafabd322010-07-19 20:26:1561Don't actually add the file(s), just show if they exist and/or will
62be ignored.
Junio C Hamano1a4e8412005-12-27 08:17:2363
Junio C Hamanoeb415992008-06-08 22:49:4764-v::
65--verbose::
Junio C Hamano1a4e8412005-12-27 08:17:2366 Be verbose.
67
Junio C Hamano3d2adc72006-12-26 03:21:4568-f::
Junio C Hamano00e884a2008-06-15 05:10:3869--force::
Junio C Hamano3d2adc72006-12-26 03:21:4570Allow adding otherwise ignored files.
71
Junio C Hamanoeb415992008-06-08 22:49:4772-i::
73--interactive::
Junio C Hamano17bbaca2006-12-25 11:36:3174Add modified contents in the working tree interactively to
Junio C Hamanoe0facb92007-12-05 10:59:4875the index. Optional path arguments may be supplied to limit
76operation to a subset of the working tree. See ``Interactive
77mode'' for details.
78
Junio C Hamanoeb415992008-06-08 22:49:4779-p::
80--patch::
Junio C Hamano7df6dcf2009-09-13 09:51:1781Interactively choose hunks of patch between the index and the
82work tree and add them to the index. This gives the user a chance
83to review the difference before adding modified contents to the
84index.
Junio C Hamanoe1b26832009-11-15 10:02:5685+
86This effectively runs `add --interactive`, but bypasses the
87initial command menu and directly jumps to the `patch` subcommand.
88See ``Interactive mode'' for details.
Junio C Hamano17bbaca2006-12-25 11:36:3189
Junio C Hamano52ba2952009-05-18 17:43:0290-e, \--edit::
91Open the diff vs. the index in an editor and let the user
92edit it. After the editor was closed, adjust the hunk headers
93and apply the patch to the index.
94+
Junio C Hamano97bcb482010-11-25 03:16:0795The intent of this option is to pick and choose lines of the patch to
96apply, or even to modify the contents of lines to be staged. This can be
97quicker and more flexible than using the interactive hunk selector.
98However, it is easy to confuse oneself and create a patch that does not
99apply to the index. See EDITING PATCHES below.
Junio C Hamano52ba2952009-05-18 17:43:02100
Junio C Hamano3d30fd52007-05-08 00:32:53101-u::
Junio C Hamano00e884a2008-06-15 05:10:38102--update::
Junio C Hamanoae05fee2010-01-08 07:39:46103Only match <filepattern> against already tracked files in
104the index rather than the working tree. That means that it
105will never stage new files, but that it will stage modified
106new contents of tracked files and that it will remove files
107from the index if the corresponding files in the working tree
108have been removed.
109+
110If no <filepattern> is given, default to "."; in other words,
111update all tracked files in the current directory and its
112subdirectories.
Junio C Hamano3d30fd52007-05-08 00:32:53113
Junio C Hamano5ba2c222008-07-21 04:33:46114-A::
115--all::
Junio C Hamanoae05fee2010-01-08 07:39:46116Like `-u`, but match <filepattern> against files in the
117working tree in addition to the index. That means that it
118will find new files as well as staging modified content and
119removing files that are no longer in the working tree.
Junio C Hamano845880c2008-10-21 19:04:45120
121-N::
122--intent-to-add::
123Record only the fact that the path will be added later. An entry
124for the path is placed in the index with no content. This is
125useful for, among other things, showing the unstaged content of
Junio C Hamanoae05fee2010-01-08 07:39:46126such files with `git diff` and committing them with `git commit
127-a`.
Junio C Hamano845880c2008-10-21 19:04:45128
Junio C Hamanoeb415992008-06-08 22:49:47129--refresh::
Junio C Hamano024b6c62007-08-14 09:43:08130Don't add the file(s), but only refresh their stat()
131information in the index.
132
Junio C Hamanoeb415992008-06-08 22:49:47133--ignore-errors::
Junio C Hamanofeeb1be2008-05-22 00:53:35134If some files could not be added because of errors indexing
135them, do not abort the operation, but continue adding the
136others. The command shall still exit with non-zero status.
Junio C Hamanob77f8192011-05-05 01:30:38137The configuration variable `add.ignoreErrors` can be set to
138true to make this the default behaviour.
Junio C Hamanofeeb1be2008-05-22 00:53:35139
Junio C Hamanoafabd322010-07-19 20:26:15140--ignore-missing::
141This option can only be used together with --dry-run. By using
142this option the user can check if any of the given files would
143be ignored, no matter if they are already present in the work
144tree or not.
145
Junio C Hamano1bb569e2006-05-05 23:14:25146\--::
Junio C Hamano7e9f6b72006-02-22 10:44:55147This option can be used to separate command-line options from
148the list of files, (useful when filenames might be mistaken
149for command-line options).
150
Junio C Hamano1a4e8412005-12-27 08:17:23151
Junio C Hamano9fbd4f72007-05-18 15:54:37152Configuration
153-------------
154
Junio C Hamanoae05fee2010-01-08 07:39:46155The optional configuration variable `core.excludesfile` indicates a path to a
Junio C Hamano9fbd4f72007-05-18 15:54:37156file containing patterns of file names to exclude from git-add, similar to
157$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
Junio C Hamanofce7c7e2008-07-02 03:06:38158those in info/exclude. See linkgit:gitrepository-layout[5].
Junio C Hamano9fbd4f72007-05-18 15:54:37159
160
Junio C Hamano1a4e8412005-12-27 08:17:23161EXAMPLES
162--------
Junio C Hamano1a4e8412005-12-27 08:17:23163
Junio C Hamano2db3e752010-09-03 21:33:06164* Adds content from all `*.txt` files under `Documentation` directory
Junio C Hamano6d76d612008-05-09 05:46:08165and its subdirectories:
166+
167------------
Junio C Hamano78b92a82010-02-09 07:34:13168$ git add Documentation/\*.txt
Junio C Hamano6d76d612008-05-09 05:46:08169------------
Junio C Hamano1a4e8412005-12-27 08:17:23170+
Junio C Hamano2db3e752010-09-03 21:33:06171Note that the asterisk `*` is quoted from the shell in this
Junio C Hamanof8a79222009-03-01 08:02:50172example; this lets the command include the files from
Junio C Hamano1a4e8412005-12-27 08:17:23173subdirectories of `Documentation/` directory.
174
Junio C Hamano6d76d612008-05-09 05:46:08175* Considers adding content from all git-*.sh scripts:
176+
177------------
178$ git add git-*.sh
179------------
180+
Junio C Hamanof8a79222009-03-01 08:02:50181Because this example lets the shell expand the asterisk (i.e. you are
Junio C Hamano6d76d612008-05-09 05:46:08182listing the files explicitly), it does not consider
183`subdir/git-foo.sh`.
Junio C Hamano1a4e8412005-12-27 08:17:23184
Junio C Hamano17bbaca2006-12-25 11:36:31185Interactive mode
186----------------
187When the command enters the interactive mode, it shows the
Junio C Hamanof9771f62007-01-17 17:42:30188output of the 'status' subcommand, and then goes into its
Junio C Hamano17bbaca2006-12-25 11:36:31189interactive command loop.
190
191The command loop shows the list of subcommands available, and
192gives a prompt "What now> ". In general, when the prompt ends
193with a single '>', you can pick only one of the choices given
194and type return, like this:
195
196------------
197 *** Commands ***
198 1: status 2: update 3: revert 4: add untracked
199 5: patch 6: diff 7: quit 8: help
200 What now> 1
201------------
202
Junio C Hamanoae05fee2010-01-08 07:39:46203You also could say `s` or `sta` or `status` above as long as the
Junio C Hamano17bbaca2006-12-25 11:36:31204choice is unique.
205
206The main command loop has 6 subcommands (plus help and quit).
207
208status::
209
210 This shows the change between HEAD and index (i.e. what will be
Junio C Hamanoae05fee2010-01-08 07:39:46211 committed if you say `git commit`), and between index and
Junio C Hamano17bbaca2006-12-25 11:36:31212 working tree files (i.e. what you could stage further before
Junio C Hamanoae05fee2010-01-08 07:39:46213 `git commit` using `git add`) for each path. A sample output
Junio C Hamano17bbaca2006-12-25 11:36:31214 looks like this:
215+
216------------
217 staged unstaged path
218 1: binary nothing foo.png
219 2: +403/-35 +1/-1 git-add--interactive.perl
220------------
221+
222It shows that foo.png has differences from HEAD (but that is
223binary so line count cannot be shown) and there is no
224difference between indexed copy and the working tree
225version (if the working tree version were also different,
226'binary' would have been shown in place of 'nothing'). The
Junio C Hamano2db3e752010-09-03 21:33:06227other file, git-add{litdd}interactive.perl, has 403 lines added
Junio C Hamano17bbaca2006-12-25 11:36:31228and 35 lines deleted if you commit what is in the index, but
229working tree file has further modifications (one addition and
230one deletion).
231
232update::
233
Junio C Hamanof8a79222009-03-01 08:02:50234 This shows the status information and issues an "Update>>"
235 prompt. When the prompt ends with double '>>', you can
Junio C Hamano17bbaca2006-12-25 11:36:31236 make more than one selection, concatenated with whitespace or
237 comma. Also you can say ranges. E.g. "2-5 7,9" to choose
Junio C Hamano38ddcce2008-07-15 15:49:03238 2,3,4,5,7,9 from the list. If the second number in a range is
239 omitted, all remaining patches are taken. E.g. "7-" to choose
240 7,8,9 from the list. You can say '*' to choose everything.
Junio C Hamano17bbaca2006-12-25 11:36:31241+
242What you chose are then highlighted with '*',
243like this:
244+
245------------
246 staged unstaged path
247 1: binary nothing foo.png
248* 2: +403/-35 +1/-1 git-add--interactive.perl
249------------
250+
251To remove selection, prefix the input with `-`
252like this:
253+
254------------
255Update>> -2
256------------
257+
258After making the selection, answer with an empty line to stage the
259contents of working tree files for selected paths in the index.
260
261revert::
262
263 This has a very similar UI to 'update', and the staged
264 information for selected paths are reverted to that of the
265 HEAD version. Reverting new paths makes them untracked.
266
267add untracked::
268
269 This has a very similar UI to 'update' and
270 'revert', and lets you add untracked paths to the index.
271
272patch::
273
Junio C Hamanof8a79222009-03-01 08:02:50274 This lets you choose one path out of a 'status' like selection.
275 After choosing the path, it presents the diff between the index
Junio C Hamano17bbaca2006-12-25 11:36:31276 and the working tree file and asks you if you want to stage
Junio C Hamano9eb58352011-05-11 20:09:24277 the change of each hunk. You can select one of the following
278 options and type return:
Junio C Hamano17bbaca2006-12-25 11:36:31279
Junio C Hamano8760ea62008-03-14 08:58:45280 y - stage this hunk
281 n - do not stage this hunk
Junio C Hamanoa574a092010-06-13 19:57:10282 q - quit; do not stage this hunk nor any of the remaining ones
283 a - stage this hunk and all later hunks in the file
284 d - do not stage this hunk nor any of the later hunks in the file
Junio C Hamano3bd66e92009-04-18 06:17:56285 g - select a hunk to go to
286 / - search for a hunk matching the given regex
Junio C Hamano8760ea62008-03-14 08:58:45287 j - leave this hunk undecided, see next undecided hunk
288 J - leave this hunk undecided, see next hunk
289 k - leave this hunk undecided, see previous undecided hunk
290 K - leave this hunk undecided, see previous hunk
Junio C Hamanoe0facb92007-12-05 10:59:48291 s - split the current hunk into smaller hunks
Junio C Hamano46a38aa2008-07-14 03:13:27292 e - manually edit the current hunk
Junio C Hamanoe0facb92007-12-05 10:59:48293 ? - print help
Junio C Hamano17bbaca2006-12-25 11:36:31294+
295After deciding the fate for all hunks, if there is any hunk
296that was chosen, the index is updated with the selected hunks.
Junio C Hamano9eb58352011-05-11 20:09:24297+
298You can omit having to type return here, by setting the configuration
299variable `interactive.singlekey` to `true`.
Junio C Hamano17bbaca2006-12-25 11:36:31300
301diff::
302
303 This lets you review what will be committed (i.e. between
304 HEAD and index).
305
Junio C Hamano97bcb482010-11-25 03:16:07306
307EDITING PATCHES
308---------------
309
310Invoking `git add -e` or selecting `e` from the interactive hunk
311selector will open a patch in your editor; after the editor exits, the
312result is applied to the index. You are free to make arbitrary changes
313to the patch, but note that some changes may have confusing results, or
314even result in a patch that cannot be applied. If you want to abort the
315operation entirely (i.e., stage nothing new in the index), simply delete
316all lines of the patch. The list below describes some common things you
317may see in a patch, and which editing operations make sense on them.
318
319--
320added content::
321
322Added content is represented by lines beginning with "{plus}". You can
323prevent staging any addition lines by deleting them.
324
325removed content::
326
327Removed content is represented by lines beginning with "-". You can
328prevent staging their removal by converting the "-" to a " " (space).
329
330modified content::
331
332Modified content is represented by "-" lines (removing the old content)
333followed by "{plus}" lines (adding the replacement content). You can
334prevent staging the modification by converting "-" lines to " ", and
335removing "{plus}" lines. Beware that modifying only half of the pair is
336likely to introduce confusing changes to the index.
337--
338
339There are also more complex operations that can be performed. But beware
340that because the patch is applied only to the index and not the working
341tree, the working tree will appear to "undo" the change in the index.
Junio C Hamano7165bf72011-01-04 22:06:18342For example, introducing a new line into the index that is in neither
Junio C Hamano97bcb482010-11-25 03:16:07343the HEAD nor the working tree will stage the new line for commit, but
344the line will appear to be reverted in the working tree.
345
346Avoid using these constructs, or do so with extreme caution.
347
348--
349removing untouched content::
350
351Content which does not differ between the index and working tree may be
352shown on context lines, beginning with a " " (space). You can stage
353context lines for removal by converting the space to a "-". The
354resulting working tree file will appear to re-add the content.
355
356modifying existing content::
357
358One can also modify context lines by staging them for removal (by
359converting " " to "-") and adding a "{plus}" line with the new content.
360Similarly, one can modify "{plus}" lines for existing additions or
361modifications. In all cases, the new modification will appear reverted
362in the working tree.
363
364new content::
365
366You may also add new content that does not exist in the patch; simply
367add new lines, each starting with "{plus}". The addition will appear
368reverted in the working tree.
369--
370
371There are also several operations which should be avoided entirely, as
372they will make the patch impossible to apply:
373
374* adding context (" ") or removal ("-") lines
375* deleting context or removal lines
376* modifying the contents of context or removal lines
377
Junio C Hamano9049d912008-05-29 02:09:50378SEE ALSO
Junio C Hamano2bb13102006-03-06 07:10:21379--------
Junio C Hamano35738e82008-01-07 07:55:46380linkgit:git-status[1]
381linkgit:git-rm[1]
382linkgit:git-reset[1]
383linkgit:git-mv[1]
384linkgit:git-commit[1]
385linkgit:git-update-index[1]
Junio C Hamano1a4e8412005-12-27 08:17:23386
Junio C Hamano1a4e8412005-12-27 08:17:23387GIT
388---
Junio C Hamanof7c042d2008-06-06 22:50:53389Part of the linkgit:git[1] suite