diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-02-04 09:20:09 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-02-05 16:44:51 -0800 |
| commit | b4b313f94ab06fabe78fa91b3f2ebbc7ef08b012 (patch) | |
| tree | 7d11a0d21b8aae16296b29abaf0d1c150d31398f /Documentation | |
| parent | Git 1.9-rc2 (diff) | |
| download | tgif-b4b313f94ab06fabe78fa91b3f2ebbc7ef08b012.tar.xz | |
reset: support "--mixed --intent-to-add" mode
When --mixed is used, entries could be removed from index if the
target ref does not have them. When "reset" is used in preparation for
commit spliting (in a dirty worktree), it could be hard to track what
files to be added back. The new option --intent-to-add simplifies it
by marking all removed files intent-to-add.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Diffstat (limited to 'Documentation')
| -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 |