git-cmd-pull-rebase-error

发表于 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
GreatWall@GreatWall-PC MINGW64 /d/work/videoshare_android.git (master)
$ git pull --rebase
remote: Counting objects: 21, done.
remote: Compressing objects: 100% (19/19), done.
remote: Total 21 (delta 11), reused 0 (delta 0)
Unpacking objects: 100% (21/21), done.
From git.oschina.net:huangshan309/videoshare_anroid
   7a5bcb8..8f12aaa  master     -> origin/master
First, rewinding head to replay your work on top of it...
/mingw64/libexec/git-core/git-rebase--am: line 54: /mingw64/libexec/git-core/git: Invalid argument

git encountered an error while preparing the patches to replay
these revisions:

    8f12aaa608b02f16d5e07e3cc3faa1f8a23cb4d7...0406eb59af12c590b85f70ac6883e340466bbf61

As a result, git cannot rebase them.

GreatWall@GreatWall-PC MINGW64 /d/work/videoshare_android.git ((0406eb5...))
$ git status
Not currently on any branch.
nothing to commit, working tree clean

处理方法：
git checkout master
git pull –rebase