projects
/
shutils.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dotfiles: gitconfig update
[shutils.git]
/
dotfiles
/
gitconfig
diff --git
a/dotfiles/gitconfig
b/dotfiles/gitconfig
index d31aa9e6ee118f00da5990e5cba7acf9775b7954..80b45a553e6eab4d2c38e437cb84576d6d9be341 100644
(file)
--- a/
dotfiles/gitconfig
+++ b/
dotfiles/gitconfig
@@
-2,18
+2,29
@@
name = Stefan Huber
email = me@example.com
signingkey = 0123456
name = Stefan Huber
email = me@example.com
signingkey = 0123456
+[http]
+ #prxy = http://username:password@192.168.9.10:8080
[color]
ui = auto
[color]
ui = auto
+ status = auto
+ branch = auto
+ diff = auto
+ interactive = auto
[core]
editor = vim
pager = less -FXRS -x4
[core]
editor = vim
pager = less -FXRS -x4
-[merge]
- tool = splice
[mergetool "splice"]
cmd = "gvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
trustExitCode = true
[mergetool "splice"]
cmd = "gvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
trustExitCode = true
+[merge]
+ tool = splice
+[push]
+ default = simple
[alias]
wdiff = diff --color-words
wlog = log --color-words
[diff]
renames = true
[alias]
wdiff = diff --color-words
wlog = log --color-words
[diff]
renames = true
+ submodule = log
+[status]
+ #submodulesummary = true ; reduces speed of 'git status'
\ No newline at end of file