📒 apps/git: Drop gpg workaround, add git pull strategy
This commit does two things to my .gitconfig
:
- Drops
[gpg]
section, since Fedora now packages GnuPG v2 instead of v1 for some time now - Adds a
[pull]
section with rebase as default pull strategy to address warning message (see below)
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.
Edited by JWF