c0de/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change formatting

Browse Source
This commit is contained in:
David Todd 2019-05-24 12:59:58 -05:00
parent 6a36ab460e
commit e4c4c3703e
1 changed files with 36 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
home/gitconfig
View File

@ -5,21 +5,17 @@
autocrlf = false autocrlf = false
safecrlf = true safecrlf = true
preloadindex = 1 preloadindex = 1
pager=less -R pager = less -R
[apply] [apply]
whitespace = fix whitespace = fix
[color] [color]
ui = auto ui = auto
interactive = true interactive = true
status = true status = true
branch = true branch = true
diff = true diff = true
[push] [push]
default = tracking default = tracking
[alias] [alias]
lol = log --all --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit lol = log --all --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
st = status -sb st = status -sb
@ -32,20 +28,20 @@
dfc = diff --cached dfc = diff --cached
mergemaster = mergetool mergemaster = mergetool
ci = commit -v ci = commit -v
push-with-tags = "!git push && git push --tags" push-with-tags = !git push && git push --tags
pull-with-submodules = "!git pull && git submodule update --init" pull-with-submodules = !git pull && git submodule update --init
rpull-with-submodules = "!git pull --rebase --stat && git submodule update --init" rpull-with-submodules = !git pull --rebase --stat && git submodule update --init
[merge] [merge]
tool = vimdiff tool = vimdiff
[mergetool "fugitive"] [mergetool "fugitive"]
cmd =fugitive vim -f -c \"Gdiff\" \"$MERGED\" cmd = fugitive vim -f -c \"Gdiff\" \"$MERGED\"
[user] [user]
email = dtodd@oceantech.com email = dtodd@oceantech.com
name = David Todd name = David Todd
[include] [include]
path = ~/.githubtokens path = ~/.githubtokens
path = ~/.dotoverrides/gitconfig path = ~/.dotoverrides/gitconfig
[diff]
guitool = kdiff3
[difftool "kdiff3"]
path = /usr/bin/kdiff3