Skip to content

Instantly share code, notes, and snippets.

@milushov
Created February 23, 2015 15:29
Show Gist options
  • Save milushov/1437cd9a1dbb50f9bde8 to your computer and use it in GitHub Desktop.
Save milushov/1437cd9a1dbb50f9bde8 to your computer and use it in GitHub Desktop.
.gitconfig
[user]
name = Roma Milushov
email = [email protected]
[giggle]
main-window-maximized = true
main-window-geometry = 0x0+0+0
history-view-vpane-position = 304
file-view-vpane-position = 386
main-window-view = HistoryView
[color]
ui = true
[merge]
ff = false
[github]
user = milushov
[push]
default = tracking
[alias]
pl = pull --ff-only
lg = log --graph --pretty=format:'%Cred%h%Creset %C(yellow)%an%d%Creset %s %Cgreen(%cr)%Creset' --date=relative
pb = "!git push -u origin \"$(git rev-parse --abbrev-ref HEAD)\""
up = "!git pull origin \"$(git rev-parse --abbrev-ref HEAD)\""
pr = "!open \"$(git remote -v | grep origin | grep push | cut -f 2 | cut -d \" \" -f 1 | sed -e \"s|git@\\(.*\\):\\(.*\\).git|https://\\1/\\2|\")/pull/new/$(git rev-parse --abbrev-ref HEAD)\""
gh = "!open \"$(git remote -v | grep origin | grep push | cut -f 2 | cut -d \" \" -f 1 | sed -e \"s|git@\\(.*\\):\\(.*\\).git|https://\\1/\\2|\")/tree/$(git rev-parse --abbrev-ref HEAD)\""
restore = !git checkout $(git rev-list -n 1 HEAD -- "$1")^ -- "$1"
brn = !git branch -m $(git symbolic-ref --short HEAD)
[pull]
rebase = true
[core]
excludesfile = /Users/roma/.gitignore
quotepath = false
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[filter "media"]
required = true
clean = git media clean %f
smudge = git media smudge %f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment