[Bug 26466] New: Git seems to be confused.

[bugzilla-daemon at freedesktop.org]

http://bugs.freedesktop.org/show_bug.cgi?id=26466

           Summary: Git seems to be confused.
           Product: xorg
           Version: git
          Platform: Other
        OS/Version: All
            Status: NEW
          Severity: normal
          Priority: medium
         Component: Driver/Radeon
        AssignedTo: xorg-driver-ati at lists.x.org
        ReportedBy: David.Ronis at McGill.CA
         QAContact: xorg-team at lists.x.org


I'm following the git development of xf86-video-ati.   When I try to update
via:

git pull --rebase 

I get: