summaryrefslogtreecommitdiff
path: root/git-reset.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-05 09:25:18 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-07 06:57:42 (GMT)
commite9c8409900fc84cd7721117c98dfe01acd535aa2 (patch)
tree9904b7d43e86e423dbfc8454a5e7306c24d7cb73 /git-reset.sh
parent13e86efbeae5994a85cc482b3964db7298c5c6ea (diff)
downloadgit-e9c8409900fc84cd7721117c98dfe01acd535aa2.zip
git-e9c8409900fc84cd7721117c98dfe01acd535aa2.tar.gz
git-e9c8409900fc84cd7721117c98dfe01acd535aa2.tar.bz2
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-reset.sh')
0 files changed, 0 insertions, 0 deletions