From: Sitaram Chamarty <sitaramc@gmail.com>
Date: Mon, 15 Dec 2008 01:03:54 GMT
Subject: Re: Possibly-spurious 'not uptodate. Cannot merge'
Message-ID: <gi4adq$cr1$1@ger.gmane.org>
In-Reply-To: <874p16puuq.fsf@hades.wkstn.nix>

On 2008-12-14, Nix <nix@esperi.org.uk> wrote:
> In this situation, 'git diff' reports no changes at all, but 'git reset
> --hard' gets the tree back into a state where merging succeeds, as does
> 'git update-index --refresh'.

Wasn't there some situation in which merely running 'git
status' would have a similar effect?  I seem to recall
reading that somewhere but now I can't find any mention of
it in 'git help status'.