diff options
| author | David Runge <dave@sleepmap.de> | 2020-06-20 23:59:54 +0200 |
|---|---|---|
| committer | David Runge <dave@sleepmap.de> | 2020-06-20 23:59:54 +0200 |
| commit | 9bd1674894318ca9b37a81545b8ac9c918fcc1d5 (patch) | |
| tree | c387e5b1d784dadfb1495045bfe324b9f48f95b8 /.config/git/config | |
| parent | 843a8cbf68fe1a3ac5d313185be4682ce323439f (diff) | |
| download | dotfiles-9bd1674894318ca9b37a81545b8ac9c918fcc1d5.tar.gz dotfiles-9bd1674894318ca9b37a81545b8ac9c918fcc1d5.tar.bz2 dotfiles-9bd1674894318ca9b37a81545b8ac9c918fcc1d5.tar.xz dotfiles-9bd1674894318ca9b37a81545b8ac9c918fcc1d5.zip | |
Pulling with fast-forward only by default.
Diffstat (limited to '.config/git/config')
| -rw-r--r-- | .config/git/config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config index 06c6e88..bca3150 100644 --- a/.config/git/config +++ b/.config/git/config @@ -103,6 +103,8 @@ whitespace = nowarn [branch] autosetupmerge = true +[pull] + ff = only [push] # 'git push' will push the current branch to its tracking branch # the usual default is to push all branches |