lkml.org 
[lkml]   [2007]   [Jul]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: why does git perpetually complain about include/asm-blackfin/macros.h?
    Jesper Juhl wrote:
    > On 02/07/07, Jeff Garzik <jeff@garzik.org> wrote:
    >> Robert P. J. Day wrote:
    >> > for the umpteenth time, after doing a pull, i see this:
    >> >
    >> > $ git diff
    >> > diff --git a/include/asm-blackfin/macros.h
    >> b/include/asm-blackfin/macros.h
    >> > deleted file mode 100644
    >> > index e69de29..0000000
    >> > $
    >>
    >> I have the same problem. git 1.5.0.6 on Fedora Core 5 or 6.
    >>
    >> I even tried a completely fresh clone, but the problem still appears.
    >>
    > I've seen that as well, but in my case doing a
    > $ git reset --hard master
    > fixed it.

    Sure. git checkout -f fixes it too.

    But then it reappears the every time I switch branches.

    Jeff



    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-07-02 16:15    [W:0.022 / U:29.808 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site