Big spaces-to-tabs config reflow
Moving to doing tabs in things. No functional changes.
This commit is contained in:
parent
2de811b974
commit
a9a94840e9
7 changed files with 142 additions and 142 deletions
32
.gitconfig
32
.gitconfig
|
@ -1,34 +1,34 @@
|
|||
[apply]
|
||||
whitespace = fix
|
||||
whitespace = fix
|
||||
|
||||
[core]
|
||||
# Declare erroenous the same whitespace errors vim does
|
||||
whitespace = space-before-tab,-indent-with-non-tab,trailing-space
|
||||
editor = vim
|
||||
# Declare erroenous the same whitespace errors vim does
|
||||
whitespace = space-before-tab,-indent-with-non-tab,trailing-space
|
||||
editor = vim
|
||||
|
||||
[diff]
|
||||
# Detect both copies and renames in diffs
|
||||
renames = copies
|
||||
tool = vimdiff
|
||||
# Detect both copies and renames in diffs
|
||||
renames = copies
|
||||
tool = vimdiff
|
||||
|
||||
[difftool]
|
||||
prompt = false
|
||||
prompt = false
|
||||
|
||||
[merge]
|
||||
# Log merge activities to output
|
||||
log = true
|
||||
tool = vimdiff
|
||||
# Log merge activities to output
|
||||
log = true
|
||||
tool = vimdiff
|
||||
|
||||
[pretty]
|
||||
terse = format:%C(auto,yellow)%h%C(auto,reset) %s %C(auto,green)(%cr) %C(auto,bold blue) %an %C(auto,reset)%C(auto,red)%d%C(auto,reset)
|
||||
terse = format:%C(auto,yellow)%h%C(auto,reset) %s %C(auto,green)(%cr) %C(auto,bold blue) %an %C(auto,reset)%C(auto,red)%d%C(auto,reset)
|
||||
|
||||
[push]
|
||||
# Reinforce git 2.0 default behavior for consistency
|
||||
default = simple
|
||||
followTags = true
|
||||
# Reinforce git 2.0 default behavior for consistency
|
||||
default = simple
|
||||
followTags = true
|
||||
|
||||
[alias]
|
||||
tlog = log --pretty=terse
|
||||
tlog = log --pretty=terse
|
||||
|
||||
# A gross fix for the fact that I need two different [user] blocks depending on
|
||||
# what system I'm on. The local file will only contian [user].
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue