From 0d81e51096b5d72285ea3de11eb1db37a0a7924b Mon Sep 17 00:00:00 2001 From: binaryDiv Date: Tue, 16 Mar 2021 11:58:14 +0100 Subject: [PATCH] .gitconfig: replace tabs with spaces; rename user_private to user_binaryDiv --- .gitconfig.inc/common.gitconfig | 21 ++++++++++++--------- .gitconfig.inc/user_binaryDiv.gitconfig | 10 ++++++++++ .gitconfig.inc/user_private.gitconfig | 8 -------- 3 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 .gitconfig.inc/user_binaryDiv.gitconfig delete mode 100644 .gitconfig.inc/user_private.gitconfig diff --git a/.gitconfig.inc/common.gitconfig b/.gitconfig.inc/common.gitconfig index ecdb74e..45b95e2 100644 --- a/.gitconfig.inc/common.gitconfig +++ b/.gitconfig.inc/common.gitconfig @@ -1,20 +1,23 @@ +[core] + eol = lf + [init] - defaultBranch = main + defaultBranch = main [pull] - ff = only + ff = only [pager] - branch = false - config = false - stash = false + branch = false + config = false + stash = false [diff] - tool = vimdiff - guitool = gvimdiff + tool = vimdiff + guitool = gvimdiff [diff "ansible-vault"] - textconv = ansible-vault view + textconv = ansible-vault view [alias] - graph = log --all --graph --decorate --oneline + graph = log --all --graph --decorate --oneline diff --git a/.gitconfig.inc/user_binaryDiv.gitconfig b/.gitconfig.inc/user_binaryDiv.gitconfig new file mode 100644 index 0000000..c7214b9 --- /dev/null +++ b/.gitconfig.inc/user_binaryDiv.gitconfig @@ -0,0 +1,10 @@ +[user] + name = binaryDiv + email = binarydiv@gmail.com + signingkey = F8D4956E224DA232 + +[credentials] + name = binaryDiv + +[commit] + gpgsign = true diff --git a/.gitconfig.inc/user_private.gitconfig b/.gitconfig.inc/user_private.gitconfig deleted file mode 100644 index 857b171..0000000 --- a/.gitconfig.inc/user_private.gitconfig +++ /dev/null @@ -1,8 +0,0 @@ -[user] - name = binaryDiv - email = binarydiv@gmail.com - signingkey = F8D4956E224DA232 -[credentials] - name = binaryDiv -[commit] - gpgsign = true