projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0a7668e) | patch
show-diff: don't print out the full "ce" format for unmerged files
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 27 Apr 2005 00:37:11 +0000 (17:37 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 27 Apr 2005 00:37:11 +0000 (17:37 -0700)
commitb8a55ce71d0d46204d64fe35787956e994d2a802
treec43c0b013e372e640cef38bfaf7402c494d4d9b4tree | snapshot
parent0a7668e99f513bd481ef6c4bc69995c434b91cb1commit | diff
show-diff: don't print out the full "ce" format for unmerged files

It really doesn't make sense, since there are potentially _many_ different
cache entries for an unmerged file. So just do the "U pathname" thing.
show-diff.c diff | blob | history
The core git plumbing