public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

* git.exe diff-index --cached --raw HEAD can not show unmerged file at  delete conflict case.
@ 2009-02-27 14:53 Frank Li
  2009-02-27 15:28 ` Johannes Sixt
  0 siblings, 1 reply; 2+ messages in thread
From: Frank Li @ 2009-02-27 14:53 UTC (permalink / raw)
  To: git

$ git ls-files -u
100644 658b87c67a68f0b17a835c66ab735e4bbcc5b3ab 1       rb1.txt
100644 e776c70dbc6ea929021515cf4d45a207a2f56517  3       rb1.txt


but use git.exe diff-index  --cached --raw HEAD
show nothing.

^ permalink raw reply	[flat|nested] 2+ messages in thread

• * Re: git.exe diff-index --cached --raw HEAD can not show unmerged file at    delete conflict case.
    2009-02-27 14:53 git.exe diff-index --cached --raw HEAD can not show unmerged file at delete conflict case Frank Li
  @ 2009-02-27 15:28 ` Johannes Sixt
    0 siblings, 0 replies; 2+ messages in thread
  From: Johannes Sixt @ 2009-02-27 15:28 UTC (permalink / raw)
    To: Frank Li; +Cc: git
  
  Frank Li schrieb:
  > $ git ls-files -u
  > 100644 658b87c67a68f0b17a835c66ab735e4bbcc5b3ab 1       rb1.txt
  > 100644 e776c70dbc6ea929021515cf4d45a207a2f56517  3       rb1.txt
  > 
  > 
  > but use git.exe diff-index  --cached --raw HEAD
  > show nothing.
  
  That's correct, AFAICS. You have a delete/modify conflict. You deleted
  rb1.txt locally, yet the branch that you merged in modified it.
  
  HEAD does not have the file, nor is it in the index in stage 0 nor stage 2
  ("ours"). There is nothing to compare.
  
  -- Hannes
  
  ^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-02-27 15:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-27 14:53 git.exe diff-index --cached --raw HEAD can not show unmerged file at delete conflict case Frank Li
2009-02-27 15:28 ` Johannes Sixt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox