secstate/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up my #git global config files (much needed)

Browse Source
This commit is contained in:
Colin Powell
2019-08-01 15:04:36 -04:00
parent bceca75730
commit 08bf182360
1 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
git/.gitconfig
View File

@ -5,14 +5,10 @@
signingkey = 7B405BE1 signingkey = 7B405BE1
[push] [push]
default = current default = current
[commit]
gpgsign = true
[core] [core]
excludesfile = ~/.gitignore_global 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] [alias]
undo = reset --soft HEAD^ undo = reset --soft HEAD^
stash-all = stash save --include-untracked 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))' 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] [merge]
conflictstyle = diff3 conflictstyle = diff3
[commit]
gpgsign = true
[pager] [pager]
diff = diff-so-fancy | less --tabs=1,5 -RFX diff = diff-so-fancy | less --tabs=1,5 -RFX
show = diff-so-fancy | less --tabs=1,5 -RFX show = diff-so-fancy | less --tabs=1,5 -RFX