often used aliases
disable auto-update
merge an updated upstream
testing
stop test
ignore emacs temporary files
Comment out conflicting aliases
Comment out conflicting aliases.

Namely, pu and po. By the way add *~ to .gitignore
Merge branch 'commonCustomization' into personalCustomization
Move aliases to lib/aliases.zsh

Prevent templates/zshrc.zsh-template from being too large.
Move #alias g='grep -in' to section FIND SOMETHING
Disable auto correction
Disable auto-correct
Merge branch 'master' into user
Merge remote-tracking branch 'upstream/master'

Conflicts:
	templates/zshrc.zsh-template
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:nfvzxh/oh-my-zsh
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'