diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2024-11-15 11:11:03 +0100 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2024-11-15 11:11:03 +0100 |
| commit | 0efabc71c18d88f957d6fd54d3f23364f16a2535 (patch) | |
| tree | 257452d342860197b6d8bf4825069596032af5ac /config | |
| parent | f4c18337327229371156b457f01fa666a056d84c (diff) | |
| parent | b07bd199e12ae5417a10f76c44e82483ebd7014d (diff) | |
| download | dotfiles-0efabc71c18d88f957d6fd54d3f23364f16a2535.tar.gz dotfiles-0efabc71c18d88f957d6fd54d3f23364f16a2535.tar.bz2 dotfiles-0efabc71c18d88f957d6fd54d3f23364f16a2535.zip | |
Merge branch 'master' of github.com:cacharle/dotfiles
Diffstat (limited to 'config')
| -rw-r--r-- | config/git/config.linux | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/config/git/config.linux b/config/git/config.linux index 6a34386..66cd0dd 100644 --- a/config/git/config.linux +++ b/config/git/config.linux @@ -2,8 +2,9 @@ [user] name = Charles Cabergs - email = me@cacharle.xyz - signingkey = me@cacharle.xyz + email = me@cacharle.xyz + ; signingkey = me@cacharle.xyz + signingkey = ~/.ssh/id_ed25519.pub [log] decorate = full [pull] @@ -17,8 +18,10 @@ prompt = false [mergetool "vimdiff"] cmd = "nvim -d $MERGED $LOCAL $BASE $REMOTE -c 'wincmd J | wincmd ='" -; [commit] -; gpgsign = true +[commit] + gpgsign = true +[gpg] + format = ssh [init] defaultBranch = master [difftool "bat"] |