Git: Remove all whitespace at the beginning of lines
The whitespace is not needed and makes the file more TOML like (more readable)
This commit is contained in:
parent
82d7b1fbca
commit
2f9bc0ae5f
1 changed files with 30 additions and 30 deletions
|
@ -1,61 +1,61 @@
|
||||||
[user]
|
[user]
|
||||||
{%@@ if profile == "mko-laptop" @@%}
|
{%@@ if profile == "mko-laptop" @@%}
|
||||||
email = marko.korhonen@rossum.fi
|
email = marko.korhonen@rossum.fi
|
||||||
{%@@ else @@%}
|
{%@@ else @@%}
|
||||||
email = marko@korhonen.cc
|
email = marko@korhonen.cc
|
||||||
{%@@ endif @@%}
|
{%@@ endif @@%}
|
||||||
name = Marko Korhonen
|
name = Marko Korhonen
|
||||||
signingkey = F2B9F713E7ED627336DD85E444FA3F28CD931BB0
|
signingkey = F2B9F713E7ED627336DD85E444FA3F28CD931BB0
|
||||||
|
|
||||||
[commit]
|
[commit]
|
||||||
signoff = true
|
signoff = true
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
|
|
||||||
[tag]
|
[tag]
|
||||||
gpgSign = true
|
gpgSign = true
|
||||||
signoff = true
|
signoff = true
|
||||||
|
|
||||||
[format]
|
[format]
|
||||||
signoff = true
|
signoff = true
|
||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
prompt = false
|
prompt = false
|
||||||
conflictstyle = diff3
|
conflictstyle = diff3
|
||||||
tool = nvim
|
tool = nvim
|
||||||
|
|
||||||
[mergetool]
|
[mergetool]
|
||||||
keepBackup = false
|
keepBackup = false
|
||||||
prompt = false
|
prompt = false
|
||||||
|
|
||||||
[mergetool "nvim"]
|
[mergetool "nvim"]
|
||||||
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
||||||
|
|
||||||
[diff]
|
[diff]
|
||||||
tool = nvim
|
tool = nvim
|
||||||
|
|
||||||
[difftool]
|
[difftool]
|
||||||
prompt = false
|
prompt = false
|
||||||
|
|
||||||
[difftool "nvim"]
|
[difftool "nvim"]
|
||||||
cmd = nvim -d $LOCAL $REMOTE
|
cmd = nvim -d $LOCAL $REMOTE
|
||||||
|
|
||||||
[pull]
|
[pull]
|
||||||
rebase = merges
|
rebase = merges
|
||||||
|
|
||||||
[alias]
|
[alias]
|
||||||
mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1
|
mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1
|
||||||
upstream = !git push -u origin HEAD
|
upstream = !git push -u origin HEAD
|
||||||
sync = !git pull && git push
|
sync = !git pull && git push
|
||||||
|
|
||||||
[color]
|
[color]
|
||||||
pager = no
|
pager = no
|
||||||
|
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = main
|
defaultBranch = main
|
||||||
|
|
||||||
[credential]
|
[credential]
|
||||||
helper = cache --timeout=600
|
helper = cache --timeout=600
|
||||||
helper = !pass-git-helper $@
|
helper = !pass-git-helper $@
|
||||||
|
|
||||||
[rerere]
|
[rerere]
|
||||||
enabled = true
|
enabled = true
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue