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 /builtin/stripspace.c | |
| 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 'builtin/stripspace.c')
0 files changed, 0 insertions, 0 deletions