blob: a03448f9231f78340fc492bffa009b96648ee6ac [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]
Jonathan Niederb1889c32008-06-30 01:09:04 -050011'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
Johannes Schindelinc59cb032009-04-08 23:30:24 +020012 [--edit | -e] [--all | [--update | -u]] [--intent-to-add | -N]
Ævar Arnfjörð Bjarmasonf0e5a4b2010-07-17 15:33:15 +000013 [--refresh] [--ignore-errors] [--ignore-missing] [--]
14 [<filepattern>...]
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
27after making any changes to the working directory, 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-------
Brian Hetro480611d2007-08-25 23:20:06 -040052<filepattern>...::
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`
56 and `dir/file2`) can be given to add all files in the
57 directory, recursively.
Junio C Hamano7fc9d692005-08-23 01:49:47 -070058
Stephan Beyer32402402008-06-08 03:36:09 +020059-n::
60--dry-run::
Jens Lehmann108da0d2010-07-10 00:18:38 +020061 Don't actually add the file(s), just show if they exist and/or will
62 be ignored.
Chris Shoemaker918db542005-10-29 17:46:41 -040063
Stephan Beyer32402402008-06-08 03:36:09 +020064-v::
65--verbose::
Chris Shoemaker918db542005-10-29 17:46:41 -040066 Be verbose.
67
Junio C Hamano6a1ad322006-12-25 17:46:38 -080068-f::
SZEDER Gábor69c61c42008-06-14 11:48:00 +020069--force::
Junio C Hamano6a1ad322006-12-25 17:46:38 -080070 Allow adding otherwise ignored files.
71
Stephan Beyer32402402008-06-08 03:36:09 +020072-i::
73--interactive::
Junio C Hamano6a5ad232006-12-25 01:30:55 -080074 Add modified contents in the working tree interactively to
Wincent Colaiutab63e9952007-11-25 14:15:42 +010075 the index. Optional path arguments may be supplied to limit
76 operation to a subset of the working tree. See ``Interactive
77 mode'' for details.
78
Stephan Beyer32402402008-06-08 03:36:09 +020079-p::
80--patch::
Jari Aalto5f2b1e62009-09-13 09:43:10 +030081 Interactively choose hunks of patch between the index and the
82 work tree and add them to the index. This gives the user a chance
83 to review the difference before adding modified contents to the
84 index.
Stephen Boyd46ada612009-11-13 17:45:46 -080085+
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 Hamano6a5ad232006-12-25 01:30:55 -080089
Johannes Schindelinc59cb032009-04-08 23:30:24 +020090-e, \--edit::
91 Open the diff vs. the index in an editor and let the user
92 edit it. After the editor was closed, adjust the hunk headers
93 and apply the patch to the index.
94+
Jeff King5df4d672010-10-21 10:30:35 -040095The intent of this option is to pick and choose lines of the patch to
Jeff King0fe802d2010-11-08 23:58:20 -050096apply, 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.
Johannes Schindelinc59cb032009-04-08 23:30:24 +0200100
Matthieu Moybc3561f2007-05-06 23:11:55 +0200101-u::
SZEDER Gábor69c61c42008-06-14 11:48:00 +0200102--update::
Björn Gustavsson968d7072009-12-07 09:20:09 +0100103 Only match <filepattern> against already tracked files in
104 the index rather than the working tree. That means that it
105 will never stage new files, but that it will stage modified
106 new contents of tracked files and that it will remove files
107 from the index if the corresponding files in the working tree
108 have been removed.
109+
110If no <filepattern> is given, default to "."; in other words,
111update all tracked files in the current directory and its
112subdirectories.
Matthieu Moybc3561f2007-05-06 23:11:55 +0200113
Junio C Hamanoda980532008-07-19 22:34:16 -0700114-A::
115--all::
Björn Gustavsson968d7072009-12-07 09:20:09 +0100116 Like `-u`, but match <filepattern> against files in the
117 working tree in addition to the index. That means that it
118 will find new files as well as staging modified content and
119 removing files that are no longer in the working tree.
Jeff King8776f5d2008-10-20 20:36:25 -0400120
121-N::
122--intent-to-add::
123 Record only the fact that the path will be added later. An entry
124 for the path is placed in the index with no content. This is
125 useful for, among other things, showing the unstaged content of
Björn Gustavsson441947f2009-12-07 19:26:57 +0100126 such files with `git diff` and committing them with `git commit
127 -a`.
Jeff King8776f5d2008-10-20 20:36:25 -0400128
Stephan Beyer32402402008-06-08 03:36:09 +0200129--refresh::
Alexandre Julliardd6168132007-08-11 23:59:01 +0200130 Don't add the file(s), but only refresh their stat()
131 information in the index.
132
Stephan Beyer32402402008-06-08 03:36:09 +0200133--ignore-errors::
Alex Riesen984b83e2008-05-12 19:58:29 +0200134 If some files could not be added because of errors indexing
135 them, do not abort the operation, but continue adding the
136 others. The command shall still exit with non-zero status.
137
Jens Lehmann108da0d2010-07-10 00:18:38 +0200138--ignore-missing::
139 This option can only be used together with --dry-run. By using
140 this option the user can check if any of the given files would
141 be ignored, no matter if they are already present in the work
142 tree or not.
143
seane9940042006-05-05 15:05:24 -0400144\--::
Carl Worth60ace872006-02-21 15:33:49 -0800145 This option can be used to separate command-line options from
146 the list of files, (useful when filenames might be mistaken
147 for command-line options).
148
Chris Shoemaker918db542005-10-29 17:46:41 -0400149
Michael Hendricks164b1982007-05-16 23:08:50 -0600150Configuration
151-------------
152
Björn Gustavsson441947f2009-12-07 19:26:57 +0100153The optional configuration variable `core.excludesfile` indicates a path to a
Michael Hendricks164b1982007-05-16 23:08:50 -0600154file containing patterns of file names to exclude from git-add, similar to
155$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
Jonathan Nieder6998e4d2008-06-30 17:01:21 -0500156those in info/exclude. See linkgit:gitrepository-layout[5].
Michael Hendricks164b1982007-05-16 23:08:50 -0600157
158
Junio C Hamano810bf1f2005-11-04 00:04:17 -0800159EXAMPLES
160--------
Junio C Hamano810bf1f2005-11-04 00:04:17 -0800161
Jonathan Nieder1b6c6cf2010-08-20 05:26:13 -0500162* Adds content from all `*.txt` files under `Documentation` directory
Christian Couder921177f2008-05-07 06:29:28 +0200163and its subdirectories:
164+
165------------
Junio C Hamanobf7cbb22010-02-08 12:12:41 -0800166$ git add Documentation/\*.txt
Christian Couder921177f2008-05-07 06:29:28 +0200167------------
Junio C Hamano810bf1f2005-11-04 00:04:17 -0800168+
Jonathan Nieder1b6c6cf2010-08-20 05:26:13 -0500169Note that the asterisk `*` is quoted from the shell in this
David J. Mellordcc901b2009-02-28 13:12:59 -0800170example; this lets the command include the files from
Junio C Hamano810bf1f2005-11-04 00:04:17 -0800171subdirectories of `Documentation/` directory.
172
Christian Couder921177f2008-05-07 06:29:28 +0200173* Considers adding content from all git-*.sh scripts:
174+
175------------
176$ git add git-*.sh
177------------
178+
David J. Mellordcc901b2009-02-28 13:12:59 -0800179Because this example lets the shell expand the asterisk (i.e. you are
Christian Couder921177f2008-05-07 06:29:28 +0200180listing the files explicitly), it does not consider
181`subdir/git-foo.sh`.
Junio C Hamano810bf1f2005-11-04 00:04:17 -0800182
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800183Interactive mode
184----------------
185When the command enters the interactive mode, it shows the
René Scharfe23bfbb82007-01-17 16:32:41 +0100186output of the 'status' subcommand, and then goes into its
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800187interactive command loop.
188
189The command loop shows the list of subcommands available, and
190gives a prompt "What now> ". In general, when the prompt ends
191with a single '>', you can pick only one of the choices given
192and type return, like this:
193
194------------
195 *** Commands ***
196 1: status 2: update 3: revert 4: add untracked
197 5: patch 6: diff 7: quit 8: help
198 What now> 1
199------------
200
Björn Gustavsson441947f2009-12-07 19:26:57 +0100201You also could say `s` or `sta` or `status` above as long as the
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800202choice is unique.
203
204The main command loop has 6 subcommands (plus help and quit).
205
206status::
207
208 This shows the change between HEAD and index (i.e. what will be
Björn Gustavsson441947f2009-12-07 19:26:57 +0100209 committed if you say `git commit`), and between index and
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800210 working tree files (i.e. what you could stage further before
Björn Gustavsson441947f2009-12-07 19:26:57 +0100211 `git commit` using `git add`) for each path. A sample output
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800212 looks like this:
213+
214------------
215 staged unstaged path
216 1: binary nothing foo.png
217 2: +403/-35 +1/-1 git-add--interactive.perl
218------------
219+
220It shows that foo.png has differences from HEAD (but that is
221binary so line count cannot be shown) and there is no
222difference between indexed copy and the working tree
223version (if the working tree version were also different,
224'binary' would have been shown in place of 'nothing'). The
Junio C Hamano28394782010-08-23 14:20:25 -0700225other file, git-add{litdd}interactive.perl, has 403 lines added
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800226and 35 lines deleted if you commit what is in the index, but
227working tree file has further modifications (one addition and
228one deletion).
229
230update::
231
David J. Mellordcc901b2009-02-28 13:12:59 -0800232 This shows the status information and issues an "Update>>"
233 prompt. When the prompt ends with double '>>', you can
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800234 make more than one selection, concatenated with whitespace or
235 comma. Also you can say ranges. E.g. "2-5 7,9" to choose
Ciaran McCreesh1e5aaa62008-07-14 19:29:37 +0100236 2,3,4,5,7,9 from the list. If the second number in a range is
237 omitted, all remaining patches are taken. E.g. "7-" to choose
238 7,8,9 from the list. You can say '*' to choose everything.
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800239+
240What you chose are then highlighted with '*',
241like 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+
249To remove selection, prefix the input with `-`
250like this:
251+
252------------
253Update>> -2
254------------
255+
256After making the selection, answer with an empty line to stage the
257contents of working tree files for selected paths in the index.
258
259revert::
260
261 This has a very similar UI to 'update', and the staged
262 information for selected paths are reverted to that of the
263 HEAD version. Reverting new paths makes them untracked.
264
265add untracked::
266
267 This has a very similar UI to 'update' and
268 'revert', and lets you add untracked paths to the index.
269
270patch::
271
David J. Mellordcc901b2009-02-28 13:12:59 -0800272 This lets you choose one path out of a 'status' like selection.
273 After choosing the path, it presents the diff between the index
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800274 and the working tree file and asks you if you want to stage
275 the change of each hunk. You can say:
276
Vineet Kumarbb12ac52008-03-13 11:32:16 -0700277 y - stage this hunk
278 n - do not stage this hunk
Jonathan Nieder74e42ce2010-06-12 22:32:51 -0500279 q - quit; do not stage this hunk nor any of the remaining ones
280 a - stage this hunk and all later hunks in the file
281 d - do not stage this hunk nor any of the later hunks in the file
Matthieu Moy595f6942009-04-16 18:46:23 +0200282 g - select a hunk to go to
283 / - search for a hunk matching the given regex
Vineet Kumarbb12ac52008-03-13 11:32:16 -0700284 j - leave this hunk undecided, see next undecided hunk
285 J - leave this hunk undecided, see next hunk
286 k - leave this hunk undecided, see previous undecided hunk
287 K - leave this hunk undecided, see previous hunk
Ralf Wildenhues280e50c2007-11-28 19:21:42 +0100288 s - split the current hunk into smaller hunks
Thomas Rastac083c42008-07-03 00:00:00 +0200289 e - manually edit the current hunk
Ralf Wildenhues280e50c2007-11-28 19:21:42 +0100290 ? - print help
Junio C Hamano6a5ad232006-12-25 01:30:55 -0800291+
292After deciding the fate for all hunks, if there is any hunk
293that was chosen, the index is updated with the selected hunks.
294
295diff::
296
297 This lets you review what will be committed (i.e. between
298 HEAD and index).
299
Jeff King0fe802d2010-11-08 23:58:20 -0500300
301EDITING PATCHES
302---------------
303
304Invoking `git add -e` or selecting `e` from the interactive hunk
305selector will open a patch in your editor; after the editor exits, the
306result is applied to the index. You are free to make arbitrary changes
307to the patch, but note that some changes may have confusing results, or
308even result in a patch that cannot be applied. If you want to abort the
309operation entirely (i.e., stage nothing new in the index), simply delete
310all lines of the patch. The list below describes some common things you
311may see in a patch, and which editing operations make sense on them.
312
313--
314added content::
315
316Added content is represented by lines beginning with "{plus}". You can
317prevent staging any addition lines by deleting them.
318
319removed content::
320
321Removed content is represented by lines beginning with "-". You can
322prevent staging their removal by converting the "-" to a " " (space).
323
324modified content::
325
326Modified content is represented by "-" lines (removing the old content)
327followed by "{plus}" lines (adding the replacement content). You can
328prevent staging the modification by converting "-" lines to " ", and
329removing "{plus}" lines. Beware that modifying only half of the pair is
330likely to introduce confusing changes to the index.
331--
332
333There are also more complex operations that can be performed. But beware
334that because the patch is applied only to the index and not the working
335tree, the working tree will appear to "undo" the change in the index.
Ralf Wildenhues469bfc92011-01-03 20:03:34 +0100336For example, introducing a new line into the index that is in neither
Jeff King0fe802d2010-11-08 23:58:20 -0500337the HEAD nor the working tree will stage the new line for commit, but
338the line will appear to be reverted in the working tree.
339
340Avoid using these constructs, or do so with extreme caution.
341
342--
343removing untouched content::
344
345Content which does not differ between the index and working tree may be
346shown on context lines, beginning with a " " (space). You can stage
347context lines for removal by converting the space to a "-". The
348resulting working tree file will appear to re-add the content.
349
350modifying existing content::
351
352One can also modify context lines by staging them for removal (by
353converting " " to "-") and adding a "{plus}" line with the new content.
354Similarly, one can modify "{plus}" lines for existing additions or
355modifications. In all cases, the new modification will appear reverted
356in the working tree.
357
358new content::
359
360You may also add new content that does not exist in the patch; simply
361add new lines, each starting with "{plus}". The addition will appear
362reverted in the working tree.
363--
364
365There are also several operations which should be avoided entirely, as
366they will make the patch impossible to apply:
367
368* adding context (" ") or removal ("-") lines
369* deleting context or removal lines
370* modifying the contents of context or removal lines
371
Junio C Hamano56ae8df2008-05-28 16:55:27 -0700372SEE ALSO
Jeff Muizelaar872d0012006-03-05 16:18:19 -0500373--------
Dan McGee5162e692007-12-29 00:20:38 -0600374linkgit:git-status[1]
375linkgit:git-rm[1]
376linkgit:git-reset[1]
377linkgit:git-mv[1]
378linkgit:git-commit[1]
379linkgit:git-update-index[1]
Junio C Hamano810bf1f2005-11-04 00:04:17 -0800380
Junio C Hamano7fc9d692005-08-23 01:49:47 -0700381Author
382------
383Written by Linus Torvalds <torvalds@osdl.org>
384
385Documentation
386--------------
387Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
388
389GIT
390---
Christian Couder9e1f0a82008-06-06 09:07:32 +0200391Part of the linkgit:git[1] suite