git prior sync failed; rebase still in progress

{ bigfish@bigfish /work/work/gingerbread_branch }

$repo sync

Fetching projects: 100% (249/249), done.

error: hardware/intel/linux-2.6/: prior sync failed; rebase still in progress

{ bigfish@bigfish /work/work/gingerbread_branch/hardware/intel/linux-2.6 }

$git rebase --abort

It looks like git-am is in progress. Cannot rebase.

{ bigfish@bigfish /work/work/gingerbread_branch/hardware/intel/linux-2.6 }

$git am --abort

之后repo sync又出现discarding commits的Log

{ bigfish@bigfish /work/work/gingerbread_branch }

$repo sync

Fetching projects:  66% (165/249)  remote: Counting objects: 13, done.

remote: Compressing objects: 100% (7/7), done.

remote: Total 7 (delta 6), reused 0 (delta 0)

Unpacking objects: 100% (7/7), done.

From git://jfumg-gcrmirror.jf.intel.com/a/bsp/hardware/intel/linux-2.6

   4d01254..08ec067  kernel/2.6.35.3/stable -> umg/kernel/2.6.35.3/stable

Fetching projects: 100% (249/249), done.

Syncing work tree: 100% (249/249), done.

hardware/intel/linux-2.6/: discarding 3 commits

{ bigfish@bigfish /work/work/gingerbread_branch }

$cd hardware/intel/linux-2.6/

{ bigfish@bigfish /work/work/gingerbread_branch/hardware/intel/linux-2.6 }

$git checkout $BRANCHNAME

之后再repo sync就好了