Mercurial > hg > config

diff .gitconfig @ 922:74dc16f074be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ignore ff merges
author Jeff Hammel <k0scist@gmail.com>
date Thu, 03 Oct 2024 05:36:19 -0700
parents 06d2cc0fe045
children fc88a12acf48
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