Created
June 14, 2016 15:33
-
-
Save martinsam/b51f8cd7ef10f390bafe2be85aabb1d7 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[filter "lfs"] | |
clean = git-lfs clean %f | |
smudge = git-lfs smudge %f | |
required = true | |
[user] | |
name = Samuel Martin | |
email = [email protected] | |
[user] | |
name = martinsam | |
email = [email protected] | |
[color] | |
diff = auto | |
status = auto | |
branch = auto | |
[alias] | |
st = status | |
ci = commit | |
co = checkout | |
fp = format-patch | |
lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%an %cr)%Creset' --abbrev-commit --date=relative | |
prev = checkout HEAD^1 | |
next = "!sh -c 'git log --reverse --pretty=%H master | awk \"/$(git rev-parse HEAD)/{getline;print}\" | xargs git checkout'" | |
[core] | |
pager = cat | |
editor = vim | |
[merge] | |
tool = diffmerge | |
[push] | |
default = simple | |
[credential] | |
helper = store | |
[diff] | |
tool = diffmerge | |
[difftool "diffmerge"] | |
cmd = diffmerge \"$LOCAL\" \"$REMOTE\" | |
[mergetool "diffmerge"] | |
cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE | |
trustExitCode = true |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment