![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Mon, 6 Jun 2005 03:02:31 +0000 (20:02 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Mon, 6 Jun 2005 03:02:31 +0000 (20:02 -0700) | ||
| commit | 02ede67ad45973f9f8d07db7896a537de97d21b6 | |
| tree | d13f55becd5ed77a9fd0b47162bfa2d7f56285db | tree | snapshot |
| parent | 9b63f50148bd155c00b6893dbbf48583f7b0848d | commit | 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.
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.
| git-resolve-script | diff | blob | history | |
| read-tree.c | diff | blob | history |