Skip to content

Instantly share code, notes, and snippets.

@hectr
Last active October 16, 2018 20:34
Show Gist options
  • Save hectr/1f40eed1b9e39a09f6d9b0268ab16cf4 to your computer and use it in GitHub Desktop.
Save hectr/1f40eed1b9e39a09f6d9b0268ab16cf4 to your computer and use it in GitHub Desktop.
Git config file
[user]
# TODO: set name and email
#name = <name>
#email = <email>
excludesfile = ~/.gitignore_global
editor = vim
[merge]
tool = Kaleidoscope
[mergetool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
[mergetool "sourcetree"]
cmd = /usr/local/bin/ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
#cmd = /private/var/folders/zd/bwklzpsd5_x10lmd1fmy9qm00000gn/T/AppTranslocation/43DD0F70-4626-434F-BA90-C6756DD6D59B/d/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[diff]
tool = Kaleidoscope
[difftool]
prompt = false
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool "sourcetree"]
cmd = /usr/local/bin/ksdiff -w \"$LOCAL\" \"$REMOTE\"
#cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[commit]
template = /Users/hector/.stCommitMsg
[push]
default = current
#default = simple
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[alias]
ci = "commit -v"
st = "status -s"
co = "checkout"
br = "branch"
unstage = "reset HEAD --"
undo = "reset --soft HEAD^"
parent = "!git show-branch | grep '*' | grep -v \"$(git rev-parse --abbrev-ref HEAD)\" | head -n1 | sed 's/.*\\[\\(.*\\)\\].*/\\1/' | sed 's/[\\^~].*//' #"
parent-or-develop = "![ -z `git parent` ] && echo develop || echo `git parent`"
changes = "!git diff --shortstat `git parent-or-develop` HEAD"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment