Junio C Hamano e9c8409900 diff-index --cached --raw: show tree entry on the LHS for unmerged entries. ...

This updates the way diffcore represents an unmerged pair
somewhat.  It used to be that entries with mode=0 on both sides
were used to represent an unmerged pair, but now it has an
explicit flag.  This is to allow diff-index --cached to report
the entry from the tree when the path is unmerged in the index.

This is used in updating "git reset <tree> -- <path>" to restore
absense of the path in the index from the tree.

Signed-off-by: Junio C Hamano <junkio@cox.net>

2007-01-06 22:57:42 -08:00

3.7 KiB

Raw Blame History

View Raw