这里是不是有问题

小丑竟是我自己

#1 Created at ... [Delete] [Delete and Lock User]

加上刚才合并的提交，现在我们本地分支比远程分支超前3个提交。

用git log看看：

$ git log --graph --pretty=oneline --abbrev-commit
*   e0ea545 (HEAD -> master) Merge branch 'master' of github.com:michaelliao/learngit
|\  
| * f005ed4 (origin/master) set exit=1
* | 582d922 add author
* | 8875536 add comment
|/  
* d1be385 init hello
...

本地分支比远程分支超前3个提交，怎么看出来的

廖雪峰

#2 Created at ... [Delete] [Delete and Lock User]

Your branch is ahead of 'origin/master' by 3 commits.

小丑竟是我自己

#3 Created at ... [Delete] [Delete and Lock User]

谢谢老师 git status 看出来的

不过，git log 还是看不出来。。上面超前2个还能看出来。
好吧，有点看不懂 Git log

小丑竟是我自己

#4 Created at ... [Delete] [Delete and Lock User]

$ git log --graph --decorate --pretty=oneline --abbrev-commit

* d20502d (HEAD -> dev) mergn

|\

| * ac22ea9 (origin/dev) set exit=1

* | 70b10e0 add author

* | c79f6e7 add comment

|/

* 3f542e5 add comment

* 2ee2131 init hello

* 5e3037f add test.txt

* cc9da62 remove test.txt

* 6cefa4e add test.txt

* c0fe946 888

* 0fd9c4b git tracks changes

* 83c2dea understand how stage works

* 8fa0411 append GPL

* 4010dce add distributed

* f97177f wrote a readme file

srd@DESKTOP-0DF6C3E MINGW64 /d/study/git/learngit (dev)

$ git status

On branch dev

Your branch is ahead of 'origin/dev' by 3 commits.

(use "git push" to publish your local commits)

自己动手了一下有点理解了

小丑竟是我自己

#5 Created at ... [Delete] [Delete and Lock User]

没说 git rebase 出现冲突怎么处理折腾半天

出现冲突要使用 git rebase --continue