From: Johannes Sixt <j.sixt@viscovery•net>
To: Frank Li <lznuaa@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: git.exe diff-index --cached --raw HEAD can not show unmerged file at delete conflict case.
Date: Fri, 27 Feb 2009 16:28:46 +0100 [thread overview]
Message-ID: <49A806AE.7010402@viscovery.net> (raw)
In-Reply-To: <1976ea660902270653p3b144231h86b98244173d09@mail.gmail.com>
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
prev parent reply other threads:[~2009-02-27 15:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=49A806AE.7010402@viscovery.net \
--to=j.sixt@viscovery$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
--cc=lznuaa@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox