aboutsummaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig22
1 files changed, 4 insertions, 18 deletions
diff --git a/.gitconfig b/.gitconfig
index 9400d9f..136adc4 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,5 @@
[user]
name = Luca Matei Pintilie
- signingKey = CA875B8CE4FF7C9F
[pull]
rebase = false
@@ -8,18 +7,6 @@
[commit]
gpgSign = true
-[tag]
- gpgSign = true
-
-[pull]
- rebase = false
-
-[init]
- defaultBranch = master
-
-[push]
- autoSetupRemote = true
-
[core]
pager = delta
@@ -27,10 +14,8 @@
diffFilter = delta --color-only
[delta]
- # use n and N to move between diff sections
- navigate = true
- # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
- light = false
+ navigate = true # use n and N to move between diff sections
+ light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
[merge]
conflictstyle = diff3
@@ -57,4 +42,5 @@
hunk-header-line-number-style = "#067a00"
hunk-header-style = file line-number syntax
-
+[init]
+ defaultBranch = master