projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 10b15b8) | patch
merge-recursive: adjust git-ls-tree use for the latest.
authorJunio C Hamano <junkio@cox.net>
Fri, 2 Dec 2005 05:39:41 +0000 (21:39 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 2 Dec 2005 05:39:41 +0000 (21:39 -0800)
commita6b51f11ab7f7f838a9b17f81059eebfc36e4c84
treeba312419331dbca9506e0559ab534bb1e6d914a8tree | snapshot
parent10b15b86f545e081aebba8783ad9e9acf6bf0d98commit | diff
merge-recursive: adjust git-ls-tree use for the latest.

You need to pass -t flag if you want to see tree objects in
"git-ls-tree -r" output these days.  This change broke the tree
structure reading code in git-merge-recursive used to detect D/F
conflicts.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge-recursive.py diff | blob | history
The core git plumbing