Re: rebase: strange failures to apply patc 3-way

From: Andrew Wong <andrew.kw.w@gmail.com>
Date: Mar 11, 2013, 21:34 UTC
Message-ID: <CADgNjanBm5bj7_jY5WrUXUENr7r6zMxve822OYKcyBpWGZv-SA@mail.gmail.com>
In-Reply-To: <E042F4D9-79DF-4AEF-8EDE-41BA9E5FB9EC@quendi.de>

On 3/11/13, Max Horn <max@quendi.de> wrote:

Show 8 quoted lines

> So I tried this:
>
>   git rebase branches/stable-4.6  # ... which leads to the error
>   git ls-files -m
>
> but got nothing. Perhaps you had something else in mind, though, but I am
> not quite sure what... sorry for being dense, but if you let me know what
> exactly you meant, I'll be happy to try that. As for the stat command:

I'm still digesting the information form the email. Just want to
quickly mention that the "ls-files" command should be:
    $ git ls-files --debug file1 file2

You should always get output. It prints out stat-like information for files in the index.