projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8f41523) | patch
[PATCH] update-cache --remove marks the path merged.
authorJunio C Hamano <junkio@cox.net>
Sun, 17 Apr 2005 16:53:35 +0000 (09:53 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 17 Apr 2005 16:53:35 +0000 (09:53 -0700)
commitc4e3cca1f71d34e69bdbfa0de0144ddb00f75505
treeea208e8b6d59f8a367af2886a381cb000d42713btree | snapshot
parent8f41523fc1a8cd127ff39fa111b3b5bb5105cc84commit | diff
[PATCH] update-cache --remove marks the path merged.

When update-cache --remove is run, resolve unmerged state for
the path.  This is consistent with the update-cache --add
behaviour.  Essentially, the user is telling us how he wants to
resolve the merge by running update-cache.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Fixed to do the right thing at the end.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
read-cache.c diff | blob | history
The core git plumbing