changeset 922:74dc16f074be

ignore ff merges
author Jeff Hammel <k0scist@gmail.com>
date Thu, 03 Oct 2024 05:36:19 -0700
parents 02b31a76e2c4
children b25fbb9257ec
files .gitconfig
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.gitconfig	Sun Jun 02 16:35:01 2024 -0700
+++ b/.gitconfig	Thu Oct 03 05:36:19 2024 -0700
@@ -33,3 +33,5 @@
 	submoduleSummary = true
 [gpg]
 	format = ssh
+[merge]
+	ff = no