Skip to content

Instantly share code, notes, and snippets.

@kyonmm
Created March 24, 2017 07:15
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save kyonmm/365617087bd9258f1dd8604f9b7b9d54 to your computer and use it in GitHub Desktop.
Save kyonmm/365617087bd9258f1dd8604f9b7b9d54 to your computer and use it in GitHub Desktop.
gitconfig
[user]
name = kyonmm
email = kyon.mm@gmail.com
[core]
editor = emacsclient
quotepath = true
[difftool "sourcetree"]
cmd = /Applications/p4merge.app/Contents/MacOS/p4merge \"$LOCAL\" \"$REMOTE\"
path =
[merge]
tool = sourcetree
[mergetool "sourcetree"]
cmd = /Applications/p4merge.app/Contents/MacOS/p4merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = true
[mergetool "p4merge"]
path = /Applications/p4merge.app/Contents/MacOS/p4merge
keepTemporaries = false
trustExitCode = false
[alias]
flog = "!f() { git glog --grep=$1; }; f"
alias = !git config --list | grep 'alias' | sed 's/alias.//' | sort
glog = log --graph --decorate=short --pretty=format:'%C(auto) [%h] %d %s | %ad' --date=short
bf = branch -f
ca = commit -a --amend --no-edit
ci = commit
rh = reset --hard
rs = reset --soft
rbi = rebase -i
rbi1 = rebase -i HEAD~2
rbi2 = rebase -i HEAD~3
rbi3 = rebase -i HEAD~4
rbi4 = rebase -i HEAD~5
rbi5 = rebase -i HEAD~6
rbi6 = rebase -i HEAD~7
rbi7 = rebase -i HEAD~8
rbi8 = rebase -i HEAD~9
rbi9 = rebase -i HEAD~10
rbi10 = rebase -i HEAD~11
rbm = rebase master
co = checkout
cb = checkout -b
bd = branch -d
pr = pull --rebase
df = diff --patience --color-words
d1 = diff --patience --color-words HEAD~
d2 = diff --patience --color-words HEAD~2
d3 = diff --patience --color-words HEAD~3
d4 = diff --patience --color-words HEAD~4
d5 = diff --patience --color-words HEAD~5
st = status
prom = pull --rebase origin master
cam = commit -am
ru = remote update
ra = remote add
bfm = branch -f master
rl = remote -v
cfdx = clean -fdx
pom = push origin master
cm = commit -m
ppm = push private master
rv = remote -v
[gui]
fontui = -family \"Source Han Code JP\" -size 20 -weight normal -slant roman -underline 0 -overstrike 0
fontdiff = -family \"Source Han Code JP\" -size 20 -weight normal -slant roman -underline 0 -overstrike 0
[push]
default = current
[ghq]
root = ~/repos/ghq
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment