Git Status

branch diverged

On branch master
Your branch and 'origin/master' have diverged,
and have 2 and 7 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
# folder backup
# git local commit
# git pull remote
# merge conflict
# git local commit
# git push

gitk
git status
git pull origin master
git commit -m "tmp"
git commit -am "tmp"
git pull origin master
git add .
git status
git commit -m "tmp2"
git pull origin master
atom .
git status
git add .
git commit -m "tmp3"
git status
git push origin master
gitk
branch merged

파일 하나 롤백

git checkout b1fea8b -- server.js

Commit 롤백

git revert HEAD
git revert hashhash

파일 하나 unstage

git checkout -- server.js

git diff

git log

errors

git config http.postBuffer 724288000

or

git config --global core.compression 0
git clone --depth 1 https://github.com/kenu/okdevtv
cd okdevtv
git fetch --unshallow
git pull --all

git pull push timeout

# ~/.ssh/config
Host github.com
    Hostname ssh.github.com
    Port 443
What Else?