]> git.ipfire.org Git - thirdparty/git.git/commit - cache.h
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 12dccc1) | patch
More work on merging with git-read-tree..
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 6 Jun 2005 05:07:31 +0000 (22:07 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 6 Jun 2005 05:07:31 +0000 (22:07 -0700)
commit220a0b527bd6ecd30a9d6dfed22195c95e6f445a
treec788895bfca71435d016d554c79b2d504b445550tree | snapshot
parent12dccc165400beae564d2357ce86c71937e5cdc0commit | diff
More work on merging with git-read-tree..

Add a "-u" flag to update the tree as a result of a merge.

Right now this code is way too anal about things, and fails merges it
shouldn't, but let me fix up the different cases and this will allow for
much smoother merging even in the presense of dirty data in the working
tree.
cache.h diff | blob | blame | history
git-resolve-script diff | blob | blame | history
read-tree.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.