diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2018-09-09 18:56:44 +0200 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2018-09-09 18:57:17 +0200 |
| commit | 4e33369995224606d9c46550554cf06adeef5567 (patch) | |
| tree | 678bbdadac73e909687e32e9f736aa9b4d2df535 /git | |
| parent | b01e6816cccea22fa996d5d6766ef959d3d0c496 (diff) | |
[git] ff by default
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 |