git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-03 12:26:23 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2007-01-05 01:25:18 -08:00
parent 13e86efbea
commit e9c8409900
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
diff.h
View File

@@ -144,7 +144,9 @@ extern void diff_change(struct diff_options *,
const char *base, const char *path);
extern void diff_unmerge(struct diff_options *,
const char *path);
const char *path,
unsigned mode,
const unsigned char *sha1);
extern int diff_scoreopt_parse(const char *opt);