]> git.ipfire.org Git - thirdparty/git.git/commit - cache.h
reset: support "--mixed --intent-to-add" mode
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Tue, 4 Feb 2014 02:20:09 +0000 (09:20 +0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Feb 2014 00:44:51 +0000 (16:44 -0800)
commitb4b313f94ab06fabe78fa91b3f2ebbc7ef08b012
tree7d11a0d21b8aae16296b29abaf0d1c150d31398f
parentbe961c292f1d36097afa1690df68cf90f655c855
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>
Documentation/git-reset.txt
builtin/reset.c
cache.h
read-cache.c
t/t7102-reset.sh