diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-01-05 01:25:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-06 22:57:42 -0800 |
| commit | e9c8409900fc84cd7721117c98dfe01acd535aa2 (patch) | |
| tree | 9904b7d43e86e423dbfc8454a5e7306c24d7cb73 /git-merge-stupid.sh | |
| parent | 13e86efbeae5994a85cc482b3964db7298c5c6ea (diff) | |
| download | git-e9c8409900fc84cd7721117c98dfe01acd535aa2.tar.gz git-e9c8409900fc84cd7721117c98dfe01acd535aa2.tar.xz | |
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>
Diffstat (limited to 'git-merge-stupid.sh')
0 files changed, 0 insertions, 0 deletions