chiark / gitweb /
gitconfig: turn off annoying automerge
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 13 Sep 2018 16:22:18 +0000 (17:22 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 13 Sep 2018 16:22:18 +0000 (17:22 +0100)
commitfd34cab4b9688d4b532cc60307f867ceb4194476
tree563b960a9d71fa02c0a7c0bc0f9dec4e782f7383
parente32b71d722ed261b78409c455de90484a68a270c
gitconfig: turn off annoying automerge
templates/gitconfig.in