Created
August 25, 2016 15:53
-
-
Save calderas/5495fe66dbd74b9034db62e912479ebc 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 "media"] | |
clean = git-media-clean %f | |
smudge = git-media-smudge %f | |
[user] | |
email = | |
name = I | |
[credential] | |
helper = store | |
[alias] | |
ec = config --global -e | |
up = "!git remote update -p; git merge --ff-only @{u}" | |
co = checkout | |
cob = checkout -b | |
pud = pull upstream develop | |
pod = push origin develop | |
cm = !git add -A && git commit -m | |
save = !git add -A && git commit -m 'SAVEPOINT' | |
wip = !git add -u && git commit -m "WIP" | |
undo = reset HEAD~1 --mixed | |
amend = commit -a --amend | |
lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all | |
lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all | |
lg = !"git lg1" | |
g = log --graph --pretty=custom # Show custom graph | |
l = log --pretty=custom # Show custom log | |
worddiff = !git diff --color | diff-highlight | less -r | |
pr = "!f() { git fetch -fu ${2:-origin} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f" | |
pr-clean = "!git for-each-ref refs/heads/pr/* --format='%(refname)' | while read ref ; do branch=${ref#refs/heads/} ; git branch -D $branch ; done" | |
[color] | |
ui = true | |
[core] | |
excludesfile = ~/.gitignore_global | |
editor = atom --wait | |
pager = diff-highlight | less -r | |
[color "branch"] | |
current = yellow reverse | |
local = yellow | |
remote = green | |
[color "diff"] | |
meta = yellow bold | |
frag = magenta bold | |
old = red bold | |
new = green bold | |
[color "diff-highlight"] | |
oldNormal = "red bold" | |
oldHighlight = "red bold 52" | |
newNormal = "green bold" | |
newHighlight = "green bold 22" | |
[color "status"] | |
added = yellow | |
changed = green | |
untracked = cyan | |
[filter "lfs"] | |
clean = git lfs clean %f | |
smudge = git lfs smudge %f | |
required = true | |
[pretty] | |
custom = "%C(magenta)%h%C(red)%d %C(yellow)%ar %C(green)%s %C(yellow)(%an)" | |
# │ │ │ │ └─ author name | |
# │ │ │ └─ message | |
# │ │ └─ date (relative) | |
# │ └─ decorations (branch, heads or tags) | |
# └─ hash (abbreviated) | |
[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 | |
[commit] | |
template = ~/.stCommitMsg |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment