[user]
	name = Karl Fogel
	email = kfogel@red-bean.com
[core]
	pager = /bin/cat
	excludesfile = /home/kfogel/.gitignore
[init]
	templateDir = ~/.config/git/template/
[format]
	pretty = fuller
[status]
        short = true
[diff]
	noprefix = true
        # FWIW, this diff.renameLimit was motivated by a warning I got
        # when doing 'git log --name-status' on the 'feature-sharing'
        # branch of git@github.com:hmis-tools/hmis-api-server.git from
        # commit bc0f1e2ef, with git 2.9.3:
        #
        #   warning: inexact rename detection was skipped due to too many files.
        #   warning: you may want to set your diff.renameLimit variable to at least 2074 and retry the command.
	renameLimit = 2074
[branch]
	autosetupmerge = true
[push]
	default = matching
[pull]
        # On 2020-06-18 I suddenly started getting this new message
        # when I did 'git pull'.  That's why I added this setting.
        # 
        #   $ pwd
        #   $ ~/private/work/ots/clients/red-cross/dcsops/r/arcdata-wiki
        #   $ git pull
        #   
        #   warning: Pulling without specifying how to reconcile
        #   divergent branches is discouraged. You can squelch this
        #   message by running one of the following commands sometime
        #   before your next pull:
        #   
        #     git config pull.rebase false  # merge (the default strategy)
        #     git config pull.rebase true   # rebase
        #     git config pull.ff only       # fast-forward only
        #   
        #   You can replace "git config" with "git config --global" to
        #   set a default preference for all repositories. You can
        #   also pass --rebase, --no-rebase, or --ff-only on the
        #   command line to override the configured default per
        #   invocation.
        #   $ 
        #
        # For more context, see https://www.reddit.com/r/git/comments/\
        # h7kv0y/git_2270_starts_yelling_during_pull/ .
	ff = only
[rerere]
	enabled = 1
# Three 'fsckObject' settings are recommended in this thread...
#
#   https://groups.google.com/forum/#!topic/binary-transparency/f-BI4o8HZW0
#   From: Eric Myhre
#   Subject: git integrity
#   To: binary-transparency (Google Group)
#   Message-ID: <56ABBA5B.6020703@exultant.us>
#   Date: Fri, 29 Jan 2016 11:15:39 -0800
#
# ...however, it turns out that just setting transfer.fsckObjects is
# enough, as the other two default to that.  See Paul Eggert's post
# https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01807.html.
#
# See also bug reports mentioned by DKG in the "git integrity" thread:
#
#   https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813157
#   https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=743227
#
# (See https://github.com/robbyrussell/oh-my-zsh/issues/4963 for
# discussion of an error that this setting can cause due to some
# gotchas in some repositories' git histories, though.)
[transfer]
        fsckObjects = true

# But, for some repositories, not mentioning any names (cough,
# kfogel@git.sv.gnu.org:/srv/git/emacs/elpa.git, cough), we then have
# to ignore one of the fsck messages.  See these threads for details:
#
#   https://github.com/robbyrussell/oh-my-zsh/issues/4963
#   https://github.com/holman/dotfiles/issues/231
#   http://thread.gmane.org/gmane.comp.version-control.git/288336
#
# Oh, but wait, it doesn't work anyway.  So we'll comment it out, and
# when checking out GNU ELPA, we'll comment out the above setting too.
#
# [fsck]
#         zeroPaddedFilemode = ignore