Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1 | git-add(1) |
| 2 | ========== |
| 3 | |
| 4 | NAME |
| 5 | ---- |
Junio C Hamano | 4cd1c0e | 2007-08-06 04:39:14 | [diff] [blame] | 6 | git-add - Add file contents to the index |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 7 | |
| 8 | SYNOPSIS |
| 9 | -------- |
Junio C Hamano | 8b8b0f2 | 2007-08-26 22:10:26 | [diff] [blame] | 10 | [verse] |
Junio C Hamano | e8acc8e | 2015-01-14 22:01:34 | [diff] [blame] | 11 | 'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p] |
Junio C Hamano | f26c77e | 2013-04-27 00:06:04 | [diff] [blame] | 12 | [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]] |
| 13 | [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] |
Junio C Hamano | 5380048 | 2016-09-21 23:26:43 | [diff] [blame] | 14 | [--chmod=(+|-)x] [--] [<pathspec>...] |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 15 | |
| 16 | DESCRIPTION |
| 17 | ----------- |
Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 18 | This command updates the index using the current content found in |
| 19 | the working tree, to prepare the content staged for the next commit. |
| 20 | It typically adds the current content of existing paths as a whole, |
| 21 | but with some options it can also be used to add content with |
| 22 | only part of the changes made to the working tree files applied, or |
| 23 | remove paths that do not exist in the working tree anymore. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 24 | |
Junio C Hamano | 4cd1c0e | 2007-08-06 04:39:14 | [diff] [blame] | 25 | The "index" holds a snapshot of the content of the working tree, and it |
| 26 | is this snapshot that is taken as the contents of the next commit. Thus |
Junio C Hamano | ffe10ca | 2016-02-04 00:44:23 | [diff] [blame] | 27 | after making any changes to the working tree, and before running |
Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 28 | the commit command, you must use the `add` command to add any new or |
Junio C Hamano | 4cd1c0e | 2007-08-06 04:39:14 | [diff] [blame] | 29 | modified files to the index. |
Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 30 | |
Junio C Hamano | 4cd1c0e | 2007-08-06 04:39:14 | [diff] [blame] | 31 | This command can be performed multiple times before a commit. It only |
| 32 | adds the content of the specified file(s) at the time the add command is |
| 33 | run; if you want subsequent changes included in the next commit, then |
Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 34 | you must run `git add` again to add the new content to the index. |
Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 35 | |
Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 36 | The `git status` command can be used to obtain a summary of which |
Junio C Hamano | 4cd1c0e | 2007-08-06 04:39:14 | [diff] [blame] | 37 | files have changes that are staged for the next commit. |
| 38 | |
Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 39 | The `git add` command will not add ignored files by default. If any |
| 40 | ignored files were explicitly specified on the command line, `git add` |
Junio C Hamano | 3c1f2c7 | 2007-08-17 07:48:05 | [diff] [blame] | 41 | will fail with a list of ignored files. Ignored files reached by |
Junio C Hamano | 7d9e9bd | 2007-08-29 07:31:47 | [diff] [blame] | 42 | directory recursion or filename globbing performed by Git (quote your |
Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 43 | globs before the shell) will be silently ignored. The 'git add' command can |
Junio C Hamano | 7d9e9bd | 2007-08-29 07:31:47 | [diff] [blame] | 44 | be used to add ignored files with the `-f` (force) option. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 45 | |
Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 46 | Please see linkgit:git-commit[1] for alternative ways to add content to a |
Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 47 | commit. |
| 48 | |
| 49 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 50 | OPTIONS |
| 51 | ------- |
Junio C Hamano | bca4cd6 | 2013-02-13 00:01:02 | [diff] [blame] | 52 | <pathspec>...:: |
Junio C Hamano | 3d2adc7 | 2006-12-26 03:21:45 | [diff] [blame] | 53 | 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 Hamano | 1d669b8 | 2014-03-11 21:36:00 | [diff] [blame] | 56 | 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 |
| 61 | the working tree. Note that older versions of Git used |
| 62 | to ignore removed files; use `--no-all` option if you want |
| 63 | to add modified or new files but ignore removed ones. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 64 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 65 | -n:: |
| 66 | --dry-run:: |
Junio C Hamano | afabd32 | 2010-07-19 20:26:15 | [diff] [blame] | 67 | Don't actually add the file(s), just show if they exist and/or will |
| 68 | be ignored. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 69 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 70 | -v:: |
| 71 | --verbose:: |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 72 | Be verbose. |
| 73 | |
Junio C Hamano | 3d2adc7 | 2006-12-26 03:21:45 | [diff] [blame] | 74 | -f:: |
Junio C Hamano | 00e884a | 2008-06-15 05:10:38 | [diff] [blame] | 75 | --force:: |
Junio C Hamano | 3d2adc7 | 2006-12-26 03:21:45 | [diff] [blame] | 76 | Allow adding otherwise ignored files. |
| 77 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 78 | -i:: |
| 79 | --interactive:: |
Junio C Hamano | 17bbaca | 2006-12-25 11:36:31 | [diff] [blame] | 80 | Add modified contents in the working tree interactively to |
Junio C Hamano | e0facb9 | 2007-12-05 10:59:48 | [diff] [blame] | 81 | the index. Optional path arguments may be supplied to limit |
| 82 | operation to a subset of the working tree. See ``Interactive |
| 83 | mode'' for details. |
| 84 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 85 | -p:: |
| 86 | --patch:: |
Junio C Hamano | 7df6dcf | 2009-09-13 09:51:17 | [diff] [blame] | 87 | Interactively choose hunks of patch between the index and the |
| 88 | work tree and add them to the index. This gives the user a chance |
| 89 | to review the difference before adding modified contents to the |
| 90 | index. |
Junio C Hamano | e1b2683 | 2009-11-15 10:02:56 | [diff] [blame] | 91 | + |
| 92 | This effectively runs `add --interactive`, but bypasses the |
| 93 | initial command menu and directly jumps to the `patch` subcommand. |
| 94 | See ``Interactive mode'' for details. |
Junio C Hamano | 17bbaca | 2006-12-25 11:36:31 | [diff] [blame] | 95 | |
Junio C Hamano | 1dbca52 | 2015-05-22 20:48:55 | [diff] [blame] | 96 | -e:: |
| 97 | --edit:: |
Junio C Hamano | 52ba295 | 2009-05-18 17:43:02 | [diff] [blame] | 98 | Open the diff vs. the index in an editor and let the user |
| 99 | edit it. After the editor was closed, adjust the hunk headers |
| 100 | and apply the patch to the index. |
| 101 | + |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 102 | The intent of this option is to pick and choose lines of the patch to |
| 103 | apply, or even to modify the contents of lines to be staged. This can be |
| 104 | quicker and more flexible than using the interactive hunk selector. |
| 105 | However, it is easy to confuse oneself and create a patch that does not |
| 106 | apply to the index. See EDITING PATCHES below. |
Junio C Hamano | 52ba295 | 2009-05-18 17:43:02 | [diff] [blame] | 107 | |
Junio C Hamano | 3d30fd5 | 2007-05-08 00:32:53 | [diff] [blame] | 108 | -u:: |
Junio C Hamano | 00e884a | 2008-06-15 05:10:38 | [diff] [blame] | 109 | --update:: |
Junio C Hamano | f66c463 | 2013-03-11 20:54:25 | [diff] [blame] | 110 | Update the index just where it already has an entry matching |
| 111 | <pathspec>. This removes as well as modifies index entries to |
| 112 | match the working tree, but adds no new files. |
Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 113 | + |
Junio C Hamano | 1d669b8 | 2014-03-11 21:36:00 | [diff] [blame] | 114 | If no <pathspec> is given when `-u` option is used, all |
| 115 | tracked files in the entire working tree are updated (old versions |
| 116 | of Git used to limit the update to the current directory and its |
| 117 | subdirectories). |
Junio C Hamano | 3d30fd5 | 2007-05-08 00:32:53 | [diff] [blame] | 118 | |
Junio C Hamano | 5ba2c22 | 2008-07-21 04:33:46 | [diff] [blame] | 119 | -A:: |
| 120 | --all:: |
Junio C Hamano | f26c77e | 2013-04-27 00:06:04 | [diff] [blame] | 121 | --no-ignore-removal:: |
Junio C Hamano | f66c463 | 2013-03-11 20:54:25 | [diff] [blame] | 122 | Update the index not only where the working tree has a file |
| 123 | matching <pathspec> but also where the index already has an |
| 124 | entry. This adds, modifies, and removes index entries to |
| 125 | match the working tree. |
| 126 | + |
Junio C Hamano | 1d669b8 | 2014-03-11 21:36:00 | [diff] [blame] | 127 | If no <pathspec> is given when `-A` option is used, all |
| 128 | files in the entire working tree are updated (old versions |
| 129 | of Git used to limit the update to the current directory and its |
| 130 | subdirectories). |
Junio C Hamano | 845880c | 2008-10-21 19:04:45 | [diff] [blame] | 131 | |
Junio C Hamano | c79bc67 | 2013-04-22 19:12:47 | [diff] [blame] | 132 | --no-all:: |
Junio C Hamano | f26c77e | 2013-04-27 00:06:04 | [diff] [blame] | 133 | --ignore-removal:: |
Junio C Hamano | c79bc67 | 2013-04-22 19:12:47 | [diff] [blame] | 134 | Update the index by adding new files that are unknown to the |
| 135 | index and files modified in the working tree, but ignore |
| 136 | files that have been removed from the working tree. This |
| 137 | option is a no-op when no <pathspec> is used. |
| 138 | + |
Junio C Hamano | 1d669b8 | 2014-03-11 21:36:00 | [diff] [blame] | 139 | This option is primarily to help users who are used to older |
| 140 | versions of Git, whose "git add <pathspec>..." was a synonym |
| 141 | for "git add --no-all <pathspec>...", i.e. ignored removed files. |
Junio C Hamano | c79bc67 | 2013-04-22 19:12:47 | [diff] [blame] | 142 | |
Junio C Hamano | 845880c | 2008-10-21 19:04:45 | [diff] [blame] | 143 | -N:: |
| 144 | --intent-to-add:: |
| 145 | Record only the fact that the path will be added later. An entry |
| 146 | for the path is placed in the index with no content. This is |
| 147 | useful for, among other things, showing the unstaged content of |
Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 148 | such files with `git diff` and committing them with `git commit |
| 149 | -a`. |
Junio C Hamano | 845880c | 2008-10-21 19:04:45 | [diff] [blame] | 150 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 151 | --refresh:: |
Junio C Hamano | 024b6c6 | 2007-08-14 09:43:08 | [diff] [blame] | 152 | Don't add the file(s), but only refresh their stat() |
| 153 | information in the index. |
| 154 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 155 | --ignore-errors:: |
Junio C Hamano | feeb1be | 2008-05-22 00:53:35 | [diff] [blame] | 156 | If some files could not be added because of errors indexing |
| 157 | them, do not abort the operation, but continue adding the |
| 158 | others. The command shall still exit with non-zero status. |
Junio C Hamano | b77f819 | 2011-05-05 01:30:38 | [diff] [blame] | 159 | The configuration variable `add.ignoreErrors` can be set to |
| 160 | true to make this the default behaviour. |
Junio C Hamano | feeb1be | 2008-05-22 00:53:35 | [diff] [blame] | 161 | |
Junio C Hamano | afabd32 | 2010-07-19 20:26:15 | [diff] [blame] | 162 | --ignore-missing:: |
| 163 | This option can only be used together with --dry-run. By using |
| 164 | this option the user can check if any of the given files would |
| 165 | be ignored, no matter if they are already present in the work |
| 166 | tree or not. |
| 167 | |
Junio C Hamano | 5380048 | 2016-09-21 23:26:43 | [diff] [blame] | 168 | --chmod=(+|-)x:: |
| 169 | Override the executable bit of the added files. The executable |
| 170 | bit is only changed in the index, the files on disk are left |
| 171 | unchanged. |
| 172 | |
Junio C Hamano | 1bb569e | 2006-05-05 23:14:25 | [diff] [blame] | 173 | \--:: |
Junio C Hamano | 7e9f6b7 | 2006-02-22 10:44:55 | [diff] [blame] | 174 | This option can be used to separate command-line options from |
| 175 | the list of files, (useful when filenames might be mistaken |
| 176 | for command-line options). |
| 177 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 178 | |
Junio C Hamano | 9fbd4f7 | 2007-05-18 15:54:37 | [diff] [blame] | 179 | Configuration |
| 180 | ------------- |
| 181 | |
Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 182 | The optional configuration variable `core.excludesFile` indicates a path to a |
Junio C Hamano | 9fbd4f7 | 2007-05-18 15:54:37 | [diff] [blame] | 183 | file 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 Hamano | 4f07aec | 2012-09-25 19:08:44 | [diff] [blame] | 185 | those in info/exclude. See linkgit:gitignore[5]. |
Junio C Hamano | 9fbd4f7 | 2007-05-18 15:54:37 | [diff] [blame] | 186 | |
| 187 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 188 | EXAMPLES |
| 189 | -------- |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 190 | |
Junio C Hamano | 2db3e75 | 2010-09-03 21:33:06 | [diff] [blame] | 191 | * Adds content from all `*.txt` files under `Documentation` directory |
Junio C Hamano | 6d76d61 | 2008-05-09 05:46:08 | [diff] [blame] | 192 | and its subdirectories: |
| 193 | + |
| 194 | ------------ |
Junio C Hamano | 78b92a8 | 2010-02-09 07:34:13 | [diff] [blame] | 195 | $ git add Documentation/\*.txt |
Junio C Hamano | 6d76d61 | 2008-05-09 05:46:08 | [diff] [blame] | 196 | ------------ |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 197 | + |
Junio C Hamano | 2db3e75 | 2010-09-03 21:33:06 | [diff] [blame] | 198 | Note that the asterisk `*` is quoted from the shell in this |
Junio C Hamano | f8a7922 | 2009-03-01 08:02:50 | [diff] [blame] | 199 | example; this lets the command include the files from |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 200 | subdirectories of `Documentation/` directory. |
| 201 | |
Junio C Hamano | 6d76d61 | 2008-05-09 05:46:08 | [diff] [blame] | 202 | * Considers adding content from all git-*.sh scripts: |
| 203 | + |
| 204 | ------------ |
| 205 | $ git add git-*.sh |
| 206 | ------------ |
| 207 | + |
Junio C Hamano | f8a7922 | 2009-03-01 08:02:50 | [diff] [blame] | 208 | Because this example lets the shell expand the asterisk (i.e. you are |
Junio C Hamano | 6d76d61 | 2008-05-09 05:46:08 | [diff] [blame] | 209 | listing the files explicitly), it does not consider |
| 210 | `subdir/git-foo.sh`. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 211 | |
Junio C Hamano | 17bbaca | 2006-12-25 11:36:31 | [diff] [blame] | 212 | Interactive mode |
| 213 | ---------------- |
| 214 | When the command enters the interactive mode, it shows the |
Junio C Hamano | f9771f6 | 2007-01-17 17:42:30 | [diff] [blame] | 215 | output of the 'status' subcommand, and then goes into its |
Junio C Hamano | 17bbaca | 2006-12-25 11:36:31 | [diff] [blame] | 216 | interactive command loop. |
| 217 | |
| 218 | The command loop shows the list of subcommands available, and |
| 219 | gives a prompt "What now> ". In general, when the prompt ends |
| 220 | with a single '>', you can pick only one of the choices given |
| 221 | and 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 Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 230 | You also could say `s` or `sta` or `status` above as long as the |
Junio C Hamano | 17bbaca | 2006-12-25 11:36:31 | [diff] [blame] | 231 | choice is unique. |
| 232 | |
| 233 | The main command loop has 6 subcommands (plus help and quit). |
| 234 | |
| 235 | status:: |
| 236 | |
| 237 | This shows the change between HEAD and index (i.e. what will be |
Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 238 | committed if you say `git commit`), and between index and |
Junio C Hamano | 17bbaca | 2006-12-25 11:36:31 | [diff] [blame] | 239 | working tree files (i.e. what you could stage further before |
Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 240 | `git commit` using `git add`) for each path. A sample output |
Junio C Hamano | 17bbaca | 2006-12-25 11:36:31 | [diff] [blame] | 241 | 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 | + |
| 249 | It shows that foo.png has differences from HEAD (but that is |
| 250 | binary so line count cannot be shown) and there is no |
| 251 | difference between indexed copy and the working tree |
| 252 | version (if the working tree version were also different, |
| 253 | 'binary' would have been shown in place of 'nothing'). The |
Junio C Hamano | 2db3e75 | 2010-09-03 21:33:06 | [diff] [blame] | 254 | other file, git-add{litdd}interactive.perl, has 403 lines added |
Junio C Hamano | 17bbaca | 2006-12-25 11:36:31 | [diff] [blame] | 255 | and 35 lines deleted if you commit what is in the index, but |
| 256 | working tree file has further modifications (one addition and |
| 257 | one deletion). |
| 258 | |
| 259 | update:: |
| 260 | |
Junio C Hamano | f8a7922 | 2009-03-01 08:02:50 | [diff] [blame] | 261 | This shows the status information and issues an "Update>>" |
| 262 | prompt. When the prompt ends with double '>>', you can |
Junio C Hamano | 17bbaca | 2006-12-25 11:36:31 | [diff] [blame] | 263 | 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 Hamano | 38ddcce | 2008-07-15 15:49:03 | [diff] [blame] | 265 | 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 Hamano | 17bbaca | 2006-12-25 11:36:31 | [diff] [blame] | 268 | + |
| 269 | What you chose are then highlighted with '*', |
| 270 | like 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 | + |
| 278 | To remove selection, prefix the input with `-` |
| 279 | like this: |
| 280 | + |
| 281 | ------------ |
| 282 | Update>> -2 |
| 283 | ------------ |
| 284 | + |
| 285 | After making the selection, answer with an empty line to stage the |
| 286 | contents of working tree files for selected paths in the index. |
| 287 | |
| 288 | revert:: |
| 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 | |
| 294 | add untracked:: |
| 295 | |
| 296 | This has a very similar UI to 'update' and |
| 297 | 'revert', and lets you add untracked paths to the index. |
| 298 | |
| 299 | patch:: |
| 300 | |
Junio C Hamano | f8a7922 | 2009-03-01 08:02:50 | [diff] [blame] | 301 | 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 Hamano | 17bbaca | 2006-12-25 11:36:31 | [diff] [blame] | 303 | and the working tree file and asks you if you want to stage |
Junio C Hamano | 9eb5835 | 2011-05-11 20:09:24 | [diff] [blame] | 304 | the change of each hunk. You can select one of the following |
| 305 | options and type return: |
Junio C Hamano | 17bbaca | 2006-12-25 11:36:31 | [diff] [blame] | 306 | |
Junio C Hamano | 8760ea6 | 2008-03-14 08:58:45 | [diff] [blame] | 307 | y - stage this hunk |
| 308 | n - do not stage this hunk |
Junio C Hamano | d75148a | 2014-04-08 19:48:38 | [diff] [blame] | 309 | q - quit; do not stage this hunk or any of the remaining ones |
Junio C Hamano | a574a09 | 2010-06-13 19:57:10 | [diff] [blame] | 310 | a - stage this hunk and all later hunks in the file |
Junio C Hamano | d75148a | 2014-04-08 19:48:38 | [diff] [blame] | 311 | d - do not stage this hunk or any of the later hunks in the file |
Junio C Hamano | 3bd66e9 | 2009-04-18 06:17:56 | [diff] [blame] | 312 | g - select a hunk to go to |
| 313 | / - search for a hunk matching the given regex |
Junio C Hamano | 8760ea6 | 2008-03-14 08:58:45 | [diff] [blame] | 314 | 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 Hamano | e0facb9 | 2007-12-05 10:59:48 | [diff] [blame] | 318 | s - split the current hunk into smaller hunks |
Junio C Hamano | 46a38aa | 2008-07-14 03:13:27 | [diff] [blame] | 319 | e - manually edit the current hunk |
Junio C Hamano | e0facb9 | 2007-12-05 10:59:48 | [diff] [blame] | 320 | ? - print help |
Junio C Hamano | 17bbaca | 2006-12-25 11:36:31 | [diff] [blame] | 321 | + |
| 322 | After deciding the fate for all hunks, if there is any hunk |
| 323 | that was chosen, the index is updated with the selected hunks. |
Junio C Hamano | 9eb5835 | 2011-05-11 20:09:24 | [diff] [blame] | 324 | + |
| 325 | You can omit having to type return here, by setting the configuration |
Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 326 | variable `interactive.singleKey` to `true`. |
Junio C Hamano | 17bbaca | 2006-12-25 11:36:31 | [diff] [blame] | 327 | |
| 328 | diff:: |
| 329 | |
| 330 | This lets you review what will be committed (i.e. between |
| 331 | HEAD and index). |
| 332 | |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 333 | |
| 334 | EDITING PATCHES |
| 335 | --------------- |
| 336 | |
| 337 | Invoking `git add -e` or selecting `e` from the interactive hunk |
| 338 | selector will open a patch in your editor; after the editor exits, the |
| 339 | result is applied to the index. You are free to make arbitrary changes |
| 340 | to the patch, but note that some changes may have confusing results, or |
| 341 | even result in a patch that cannot be applied. If you want to abort the |
| 342 | operation entirely (i.e., stage nothing new in the index), simply delete |
| 343 | all lines of the patch. The list below describes some common things you |
| 344 | may see in a patch, and which editing operations make sense on them. |
| 345 | |
| 346 | -- |
| 347 | added content:: |
| 348 | |
| 349 | Added content is represented by lines beginning with "{plus}". You can |
| 350 | prevent staging any addition lines by deleting them. |
| 351 | |
| 352 | removed content:: |
| 353 | |
| 354 | Removed content is represented by lines beginning with "-". You can |
| 355 | prevent staging their removal by converting the "-" to a " " (space). |
| 356 | |
| 357 | modified content:: |
| 358 | |
| 359 | Modified content is represented by "-" lines (removing the old content) |
| 360 | followed by "{plus}" lines (adding the replacement content). You can |
| 361 | prevent staging the modification by converting "-" lines to " ", and |
| 362 | removing "{plus}" lines. Beware that modifying only half of the pair is |
| 363 | likely to introduce confusing changes to the index. |
| 364 | -- |
| 365 | |
| 366 | There are also more complex operations that can be performed. But beware |
| 367 | that because the patch is applied only to the index and not the working |
| 368 | tree, the working tree will appear to "undo" the change in the index. |
Junio C Hamano | 7165bf7 | 2011-01-04 22:06:18 | [diff] [blame] | 369 | For example, introducing a new line into the index that is in neither |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 370 | the HEAD nor the working tree will stage the new line for commit, but |
| 371 | the line will appear to be reverted in the working tree. |
| 372 | |
| 373 | Avoid using these constructs, or do so with extreme caution. |
| 374 | |
| 375 | -- |
| 376 | removing untouched content:: |
| 377 | |
| 378 | Content which does not differ between the index and working tree may be |
| 379 | shown on context lines, beginning with a " " (space). You can stage |
| 380 | context lines for removal by converting the space to a "-". The |
| 381 | resulting working tree file will appear to re-add the content. |
| 382 | |
| 383 | modifying existing content:: |
| 384 | |
| 385 | One can also modify context lines by staging them for removal (by |
| 386 | converting " " to "-") and adding a "{plus}" line with the new content. |
| 387 | Similarly, one can modify "{plus}" lines for existing additions or |
| 388 | modifications. In all cases, the new modification will appear reverted |
| 389 | in the working tree. |
| 390 | |
| 391 | new content:: |
| 392 | |
| 393 | You may also add new content that does not exist in the patch; simply |
| 394 | add new lines, each starting with "{plus}". The addition will appear |
| 395 | reverted in the working tree. |
| 396 | -- |
| 397 | |
| 398 | There are also several operations which should be avoided entirely, as |
| 399 | they 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 Hamano | 9049d91 | 2008-05-29 02:09:50 | [diff] [blame] | 405 | SEE ALSO |
Junio C Hamano | 2bb1310 | 2006-03-06 07:10:21 | [diff] [blame] | 406 | -------- |
Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 407 | linkgit:git-status[1] |
| 408 | linkgit:git-rm[1] |
| 409 | linkgit:git-reset[1] |
| 410 | linkgit:git-mv[1] |
| 411 | linkgit:git-commit[1] |
| 412 | linkgit:git-update-index[1] |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 413 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 414 | GIT |
| 415 | --- |
Junio C Hamano | f7c042d | 2008-06-06 22:50:53 | [diff] [blame] | 416 | Part of the linkgit:git[1] suite |