aboutsummaryrefslogtreecommitdiffstats
path: root/git/.gitconfig
diff options
context:
space:
mode:
authorEugene Triguba <eugene.triguba@paymentworks.com>2025-04-22 09:00:19 -0400
committerEugene Triguba <eugene.triguba@paymentworks.com>2025-04-22 09:00:19 -0400
commitd501d97a6ea7b2768d477a13b0bbb248751f64c1 (patch)
tree962fc53f3cb3db36e11413d55466e84ac4707b77 /git/.gitconfig
parenttweak zshrc and lockfile (diff)
parentupdate neovim settings (diff)
downloaddotfiles-d501d97a6ea7b2768d477a13b0bbb248751f64c1.zip
Merge remote-tracking branch 'upstream'
Diffstat (limited to 'git/.gitconfig')
-rw-r--r--git/.gitconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/git/.gitconfig b/git/.gitconfig
index 5e70b84..ab87075 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -7,7 +7,7 @@
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
excludesfile = ~/.gitignore
[pull]
- ff = only
+ ff = only
[fetch]
prune = true
[diff]