origin
create a new branch and checkout branch
merge
conflict test
conflict test no
conflict fixed
log graph
log --on-gg
no
test
no ff merge
fix issue
merge issue
merge stash
stash commit
commit stash list
commit stash list
c
Merge branch 'master' of github.com:dicolancy/learngitlog
for push