summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Hunter <m@lfurio.us>2026-06-03 04:27:25 -0400
committerMatt Hunter <m@lfurio.us>2026-06-03 04:27:25 -0400
commita8910f60f87fcbcd95d151804463eecdf4cc28a3 (patch)
tree9e162468ec5aeba54aaeb683670021e65c3c0caa
parentc006aea65562af6944ed5237e6378ad08d274cf2 (diff)
downloadrice-a8910f60f87fcbcd95d151804463eecdf4cc28a3.tar.gz
rice-a8910f60f87fcbcd95d151804463eecdf4cc28a3.zip
git: Disable "can't fast-forward" advice
-rw-r--r--.gitconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 9792355..398a697 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,6 +5,7 @@
addIgnoredFile = false
defaultBranchName = false
detachedHead = false
+ diverging = false
implicitIdentity = false
mergeConflict = false
pushNonFastForward = false