gitconfig
[user] | |
name = David Raviv | |
email = david.raviv@worldmate.com | |
[core] | |
autocrlf = input | |
[credential] | |
helper = osxkeychain | |
[color] | |
ui = auto | |
[core] | |
# pager = less -r | |
editor = vim | |
[diff] | |
# external = ~/script/gitdiff.py | |
# tool = meld | |
[difftool] | |
prompt=false | |
[merge] | |
# tool = meld | |
[alias] | |
sync = "!f() { echo Syncing this branch with master && git checkout master && git fetch origin && git merge --ff-only origin/master && git checkout - && git rebase $1 origin/master; }; f" | |
d = diff --no-ext-diff | |
dt = difftool | |
s = status -sb | |
co = checkout | |
l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative | |
pm = "!f() { echo Fetching origin and updating master && git checkout master && git fetch origin && git merge --ff-only origin/master; }; f" | |
cb = "!f() { echo Fetching origin and basing a new branch on origin/master && git fetch origin && git checkout -b $1 origin/master; }; f" | |
[mergetool] | |
keepBackup = false |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment