Clean up my #git global config files (much needed)
This commit is contained in:
@ -5,14 +5,10 @@
|
||||
signingkey = 7B405BE1
|
||||
[push]
|
||||
default = current
|
||||
[commit]
|
||||
gpgsign = true
|
||||
[core]
|
||||
excludesfile = ~/.gitignore_global
|
||||
[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
|
||||
[alias]
|
||||
undo = reset --soft HEAD^
|
||||
stash-all = stash save --include-untracked
|
||||
@ -30,8 +26,6 @@
|
||||
hs = for-each-ref --sort=-committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))'
|
||||
[merge]
|
||||
conflictstyle = diff3
|
||||
[commit]
|
||||
gpgsign = true
|
||||
[pager]
|
||||
diff = diff-so-fancy | less --tabs=1,5 -RFX
|
||||
show = diff-so-fancy | less --tabs=1,5 -RFX
|
||||
|
||||
Reference in New Issue
Block a user