diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-05 05:38:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-05 05:38:28 (GMT) |
| commit | ab7d70766963e1e854a1edcbb0b840242330a7cb (patch) | |
| tree | 2163e3f8d1c9bbd6715239f0bbf29e8a5a0d47bc /Documentation | |
| parent | 31cbb5d96151891491168d3f813e6898c9ef825b (diff) | |
| parent | 7e018be2ada073c92da59eb41442cde22c0c2796 (diff) | |
| download | git-ab7d70766963e1e854a1edcbb0b840242330a7cb.zip git-ab7d70766963e1e854a1edcbb0b840242330a7cb.tar.gz git-ab7d70766963e1e854a1edcbb0b840242330a7cb.tar.bz2 | |
Merge branch 'wc/add-i'
* wc/add-i:
git-add -i: add help text for list-and-choose UI
add -i: allow prefix highlighting for "Add untracked" as well.
Highlight keyboard shortcuts in git-add--interactive
Document all help keys in "git add -i" patch mode.
Add "--patch" option to git-add--interactive
add -i: Fix running from a subdirectory
builtin-add: fix command line building to call interactive
git-add -i: allow multiple selection in patch subcommand
Add path-limiting to git-add--interactive
Teach builtin-add to pass multiple paths to git-add--interactive
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-add.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 63829d9..e74f83b 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -61,7 +61,14 @@ OPTIONS -i, \--interactive:: Add modified contents in the working tree interactively to - the index. + the index. Optional path arguments may be supplied to limit + operation to a subset of the working tree. See ``Interactive + mode'' for details. + +-p, \--patch: + Similar to Interactive mode but the initial command loop is + bypassed and the 'patch' subcommand is invoked using each of + the specified filepatterns before exiting. -u:: Update only files that git already knows about. This is similar @@ -210,6 +217,8 @@ patch:: k - do not decide on this hunk now, and view the previous undecided hunk K - do not decide on this hunk now, and view the previous hunk + s - split the current hunk into smaller hunks + ? - print help + After deciding the fate for all hunks, if there is any hunk that was chosen, the index is updated with the selected hunks. |