diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2020-10-04 19:13:49 +0100 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2020-10-04 19:13:49 +0100 |
| commit | 3a3321af173a73b158c606f0e2c3c3e0dece2cb9 (patch) | |
| tree | 00075dc12714c8b128e2327542526ac0676820fc /git/.gitconfig | |
| parent | ac7ba6d8aa7eb6ef384f10b7798bd01308beb970 (diff) | |
| parent | 2c5e2b7a6667fd4e726bba3e50f9ccf6ce13bab3 (diff) | |
Merge branch 'master' of https://github.com/urbainvaes/dotfiles
Diffstat (limited to 'git/.gitconfig')
| -rw-r--r-- | git/.gitconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git/.gitconfig b/git/.gitconfig index 0e7df50..79e64f8 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -4,7 +4,7 @@ [user] name = Urbain Vaes email = urbain@vaes.uk - signingKey = 716064C0 + ; signingKey = 716064C0 [init] templatedir = ~/.git_template [alias] @@ -13,9 +13,11 @@ [http] sslverify = false [commit] - gpgSign = true + ; gpgSign = true verbose = true [push] default = simple [merge] ff = true +[pull] + rebase = false |