projects
/
shutils.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mutt: Add ciscoclean
[shutils.git]
/
dotfiles
/
gitconfig
diff --git
a/dotfiles/gitconfig
b/dotfiles/gitconfig
index d31aa9e6ee118f00da5990e5cba7acf9775b7954..c8aec3bcc6d363f8d112da683a5407cfb4b0d2a6 100644
(file)
--- a/
dotfiles/gitconfig
+++ b/
dotfiles/gitconfig
@@
-2,8
+2,14
@@
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
@@
-13,7
+19,15
@@
cmd = "gvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
trustExitCode = true
[alias]
cmd = "gvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
trustExitCode = true
[alias]
- wdiff = diff --color-words
- wlog = log --color-words
+ wdiff = diff -w --word-diff-regex="[^[:space:]]"
+ wlog = log -w --word-diff-regex="[^[:space:]]"
+ wshow = show -w --word-diff-regex="[^[:space:]]"
+[log]
+ decorate
[diff]
renames = true
[diff]
renames = true
+ submodule = log
+[status]
+ #submodulesummary = true ; reduces speed of 'git status'
+[push]
+ default = simple