diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:40 -0800 |
| commit | 8336832ad99832d21e5ee588bd3d03369048c05a (patch) | |
| tree | 787d8c70b31315c46780323e95c3cc713a961914 /Documentation/git-reset.txt | |
| parent | Merge branch 'ks/tree-diff-walk' (diff) | |
| parent | reset: support "--mixed --intent-to-add" mode (diff) | |
| download | tgif-8336832ad99832d21e5ee588bd3d03369048c05a.tar.xz | |
Merge branch 'nd/reset-intent-to-add'
* nd/reset-intent-to-add:
reset: support "--mixed --intent-to-add" mode
Diffstat (limited to 'Documentation/git-reset.txt')
| -rw-r--r-- | Documentation/git-reset.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index f445cb38fa..a077ba0ddc 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -10,7 +10,7 @@ SYNOPSIS [verse] 'git reset' [-q] [<tree-ish>] [--] <paths>... 'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...] -'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>] +'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>] DESCRIPTION ----------- @@ -60,6 +60,9 @@ section of linkgit:git-add[1] to learn how to operate the `--patch` mode. Resets the index but not the working tree (i.e., the changed files are preserved but not marked for commit) and reports what has not been updated. This is the default action. ++ +If `-N` is specified, removed paths are marked as intent-to-add (see +linkgit:git-add[1]). --hard:: Resets the index and working tree. Any changes to tracked files in the |