Git

# SAVE GITHUB AS DEFAULT
# (don't need to log in again every time we use)
git config credential.helper store
git pull

# FORMATTING DISPLAY
git config color.ui true # add colors to the results
git config format.pretty oneline # disply only one line of each commit

# WITH COLORS
git log --oneline --graph --color --all --decorate
# --graph: draw text-based branches
# --decorate: display names and tags

git log -- <file> # check commits containing <file>
git log --prep='abc' # look for commits containing "abc" in their name
git log <from>..<to> # display commints from <from> to <to> (commit's id, branch's name,...)

git log -1
# something likes HEAD -> <branch-name>

git diff file_name.abc

# get the last commit id
git log --format="%H" -n 1
# list of files
git diff-tree --no-commit-id --name-only -r <commit_id>

# they are assumed to be unchanged
git update-index --assume-unchanged file_1 file_2

# undo
git update-index --no-assume-unchanged file_1 file_2

# To get a list of dir's/files that are assume-unchanged
git ls-files -v|grep '^h'

git gui
gitk

# ADD MODIFICATION (1 FILE)
git add * # add all the changes
git add <file-name> # only add the <file-name> to the staged

# PUSH TO REMOTE
git push origin <branch-name> # push only <branch-name>
git push --all origin # push all branches

# CHECK & TEST A COMMIT
git checkout <commit-id>
# after testing
git checkout <current-branch>

# COPY A COPY FROM REMOTE
git fetch origin <branch-on-remote>
# compare current branch to this copy
git diff --stat FETCH_HEAD

# CREATE A BRANCH
git branch <branch-name>

# CREATE AND MOVE TO NEW BRANCH
# This one is based on the current `HEAD` (git log -1).
git checkout -b <new-branch>
# new branch based on another one
git checkout -b <new-branch> <existing-branch>

# CHANGE TO ANOTHER BRANCH
git checkout <branch-name>

# fatal: 'dev' could be both a local file and a tracking branch.
git checkout <branch_name> --

# UPDATE ALL REMOTE BRANCHES TO LOCAL
# (there may be deleted branches on remote)
git remote update origin --prune

# CORRESPONDING LOCAL BRANCH <-> REMOTE
git fetch
git branch --set-upstream-to=origin/<remote_branch> <local_branch>

# MERGE <branch> TO CURRENT
git merge <branch>

# MERGE <sub-branch> TO master + REPLACE master
git checkout <sub-branch>
git merge -s ours master
git checkout master
git merge <sub-branch>
# master can be other

# MERGE `/link/to/abc.xyz` FROM `<branch-1>` TO `<branch-2>` (can be `master`)
git checkout branch-2
git checkout branch-1 /link/to/abc.xyz

# MERGE ONLY SOME FOLDER
git checkout <branch>
git checkout <from-branch> folder1\ folder2\

# MERGE commit from ONE BRANCH to CURRENT
git cherry-pick <commit hash>

# KEEP FILES/FOLDERS FROM MERGE
# add line to .gitattributes
echo 'file_name.txt merge=ours' >> .gitattributes

<<<<<< HEAD
changes on local
======
changes from remote
>>>>>> template/notetheme2

# add below line to .gitattributes (on branch being merged)
echo "*.whatever merge=union" .gitattributes
# on windows, remove `""`

# ONLY FOR FILES
# add below line to .gitattributes (on branch being merged)
echo "file.ext merge=ours" .gitattributes
# on windows, remove `""`

# CURRENT BRANCH
git branch -m <newname>
git branch -M <newname> # if there are only capitalization changes

# CURRENT IS ANOTHER BRANCH
git branch -m <oldname> <newname>

# RENAME REMOTE BRANCH (delete old + push new)
# (rename local branch first)
git push origin :<oldname> <newname>
# reset the upstream branch for the new-name local branch
git checkout <newname>
git push origin -u <newname>

git branch --edit-description

# DISCARD CHANGES ON CURRENT DIR
git checkout -- . # for all changes
git checkout -- <file-name> # for a specific file (go back the last commit of this file)

# DISCARD ALL LOCAL CHANGES
git reset --hard

git stash

git stash pop

# RESTORE FROM LAST COMMIT
git checkout -- <file>

# DISCARD ALL CHANGES ON LOCAL + GET FROM REMOTE
git fetch origin
git reset --hard origin/master

# DISCARD ALL CHANGES + get the last update from remote
git reset --hard @{u}

# EREASE ALL COMMITS + BACK TO <commit-id>
git reset --hard <commit_id>
# (force) to push
git push -f origin master

# check the current remote url
cat .git/config| grep "url"

# change to the new one
git remote set-url origin new.git.url/here

# use `git br` instead of `git branch`
git config alias.br branch

# "git clone" & "git pull" to automatically update submodules.
git config --global submodule.recurse true

# public repo: github.com/you/blog (clone)
# private repo: github.com/you/posts

cd blog
git submodule add https://github.com/you/posts # blog/posts

# update submodules
git submodule update --remote
# don't make change on the folder of submodules!!!!

# clone a repo with submodules
git clone <repo> --recursive
# or
git clone <repo>
git submodule init
git submodule update