diff options
Diffstat (limited to 'git/.gitconfig')
| -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 |