Skip to content

Instantly share code, notes, and snippets.

@demoive
Last active April 25, 2017 20:11
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save demoive/ad3c44b38504caa77c17 to your computer and use it in GitHub Desktop.
Save demoive/ad3c44b38504caa77c17 to your computer and use it in GitHub Desktop.
My config settings for Git
[user]
name = Paulo Avila
#email =
[alias]
br = branch
co = checkout
ci = commit -a
feature = checkout -b
amend = commit --amend #--no-edit
di = diff
df = diff
st = status -s -b -uall
ls = ls-files
ign = ls-files -o -i --exclude-standard # Show files ignored by git
merge = merge --no-ff
## Smart Log - sl
#sl = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --all --since='90 days ago'
#sl = log --all --graph --shortstat --pretty=format:'%C(red)%h%C(reset) %C(blue)%ae%C(reset)%C(yellow)%d%C(reset) %C(cyan)(%cr)%C(reset)\n%C(green)%s%C(reset)\n'
sl = log --all --graph --pretty=format:'%C(red)%h%C(reset) %C(blue)%ae%C(reset)%C(yellow)%d%C(reset) %C(cyan)(%cr)%C(reset)\n%C(green)%s%C(reset)\n'
## Smart Log (long) - sll
## Intelligent Log - il
sll = log --all --graph --name-status --pretty=format:'%C(red)%h%C(reset) %C(blue)%ae%C(reset)%C(yellow)%d%C(reset) %C(cyan)(%cr)%C(reset)\n%C(green)%s%C(reset)\n'
## Smart Log (short) - sls
## Graph Log - gl
sls = log --graph --oneline --decorate --graph #-3 (see only the previous 3 commits
[core]
#editor = vim
excludesfile = ~/.gitignore_global
quotepath = false
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
[diff]
tool = Kaleidoscope
[difftool]
prompt = false
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[merge]
tool = Kaleidoscope
[mergetool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
required = true
[filter "hawser"]
clean = git hawser clean %f
smudge = git hawser smudge %f
required = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment