diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2018-10-02 09:55:33 +0200 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2018-10-02 09:55:33 +0200 |
| commit | e3408b335dd082371c0d9c2e1652a3c668cf3305 (patch) | |
| tree | 7531c54920322dc6a4835e05efdbe4ee2c61206b /git | |
| parent | 9eba64edd6ced4a630b612ed4ff28c83a1e29d43 (diff) | |
| parent | 4e33369995224606d9c46550554cf06adeef5567 (diff) | |
Merge branch 'master' of github.com:urbainvaes/dotfiles
Diffstat (limited to 'git')
| -rw-r--r-- | git/.gitconfig | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/git/.gitconfig b/git/.gitconfig index 1dd05ae..8b42407 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -9,9 +9,11 @@ [alias] ctags = !.git/hooks/ctags saveandsync = !git add . && git commit -m "Update" && git push origin master -[push] - default = simple [http] sslverify = false [commit] - gpgSign = True + gpgSign = true +[push] + default = simple +[merge] + ff = true |