]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9b63f50) | patch
git-read-tree: be a lot more careful about merging dirty trees
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 6 Jun 2005 03:02:31 +0000 (20:02 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 6 Jun 2005 03:02:31 +0000 (20:02 -0700)
commit02ede67ad45973f9f8d07db7896a537de97d21b6
treed13f55becd5ed77a9fd0b47162bfa2d7f56285dbtree | snapshot
parent9b63f50148bd155c00b6893dbbf48583f7b0848dcommit | 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.
git-resolve-script diff | blob | blame | history
read-tree.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.