diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-06 07:02:31 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-06 07:02:31 +0400 |
| commit | 02ede67ad45973f9f8d07db7896a537de97d21b6 (patch) | |
| tree | d13f55becd5ed77a9fd0b47162bfa2d7f56285db /cache.h | |
| parent | 9b63f50148bd155c00b6893dbbf48583f7b0848d (diff) | |
git-read-tree: be a lot more careful about merging dirty trees
We don't want to overwrite state that we haven't committed yet
when merging, so it's better to make git-read-tree fail than
end up with a merge tree that ends up not having the dirty changes.
Update git-resolve-script to fail cleanly when git-read-tree fails.
Diffstat (limited to 'cache.h')
0 files changed, 0 insertions, 0 deletions