diff options
| author | Reiner Herrmann <reiner@reiner-h.de> | 2020-05-23 11:08:26 +0200 |
|---|---|---|
| committer | Reiner Herrmann <reiner@reiner-h.de> | 2020-05-23 11:08:26 +0200 |
| commit | 8aed500052fda6280e965059cc4af1ed0ab32cb8 (patch) | |
| tree | 56ab6baaf8896cb36cebfddfb73f63839a28e463 /git/gitconfig | |
| parent | 1a31e9eb185a98f78e3e6dec9f11bb04266d9473 (diff) | |
git: allow only fast-forwards when pulling
since 2.27 git warns if no pull strategy is configured.
options are merging, rebasing or allowing only ffs.
as both merging and rebasing can be annoying, try to only
use ffs. if that's not possible, manual merging/rebasing is still
possible.
Diffstat (limited to 'git/gitconfig')
| -rw-r--r-- | git/gitconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git/gitconfig b/git/gitconfig index 01b5277..00cb691 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -37,3 +37,6 @@ [tig] diff-highlight = true + +[pull] + ff = only |