summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 18:40:59 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 18:40:59 (GMT)
commit2a68a8659f7dc55fd285d235ae2d19e7a8116c30 (patch)
tree0d2977b55c8d32c65e225d5b03b11711c1971d24 /cache.h
parentf9e7750621ca5e067f58a679caff5ff2f9881c4c (diff)
downloadgit-2a68a8659f7dc55fd285d235ae2d19e7a8116c30.zip
git-2a68a8659f7dc55fd285d235ae2d19e7a8116c30.tar.gz
git-2a68a8659f7dc55fd285d235ae2d19e7a8116c30.tar.bz2
Leave merge failures in the filesystem
This changes how we handle merges: if a automated merge fails, we will leave the index as a clean entry pointing to the original branch, and leave the actual file _dirty_ the way the "merge" program left it. You can then just do "git-diff-files -p" to see what the merge conflicts did, fix them up, and commit the end result. NOTE NOTE NOTE! Do _not_ use "git commit" to commit such a merge. It won't set the parents right. I'll need to fix that. In the meantime, you'd need to merge using git-commit-tree $(git-write) -p HEAD -p MERGE_HEAD or something like that by hand.
Diffstat (limited to 'cache.h')
0 files changed, 0 insertions, 0 deletions