diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2020-10-02 10:18:25 +0100 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2020-10-02 10:18:25 +0100 |
| commit | f45ea107bed6d6c410b7ebfee691bdbaf51947e6 (patch) | |
| tree | 5f9b11a4158c24795d68bcc649c29811d2519789 /git/.gitconfig | |
| parent | 93eab33d13f8f30c8ba0088f20721d14c981fd16 (diff) | |
| parent | 96bfc178286b367b14e6287b3ae6dc57f3e6e2f6 (diff) | |
Merge branch 'master' of localhost:public/dotfiles into master
Diffstat (limited to 'git/.gitconfig')
| -rw-r--r-- | git/.gitconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git/.gitconfig b/git/.gitconfig index 1169c34..79e64f8 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -19,3 +19,5 @@ default = simple [merge] ff = true +[pull] + rebase = false |