diff --git a/git/config b/git/config index 3326f60..c1eafb8 100644 --- a/git/config +++ b/git/config @@ -1,8 +1,3 @@ -[user] - name = Alexander Kiryukhin - email = i@neonxp.ru - signingkey = 35E33E1AB7776B39 - [alias] co = checkout ci = commit @@ -104,36 +99,32 @@ color = true submodulesummary = true -[sendemail] -# smtpserver = smtp.mail.ru -# smtpuser = a.kiryukhin@mail.ru - smtpserverport = 25 - smtpencryption = tls - [init] - defaultBranch = master + defaultBranch = master [pager] - diff = delta - log = delta - reflog = delta - show = delta + diff = delta + log = delta + reflog = delta + show = delta [interactive] - diffFilter = delta --color-only --features=interactive + diffFilter = delta --color-only --features=interactive [delta] - features = decorations + features = decorations [delta "interactive"] - keep-plus-minus-markers = false + keep-plus-minus-markers = false [delta "decorations"] - commit-decoration-style = blue ol - commit-style = raw - file-style = omit - hunk-header-decoration-style = blue box - hunk-header-file-style = red - hunk-header-line-number-style = "#067a00" - hunk-header-style = file line-number syntax + commit-decoration-style = blue ol + commit-style = raw + file-style = omit + hunk-header-decoration-style = blue box + hunk-header-file-style = red + hunk-header-line-number-style = "#067a00" + hunk-header-style = file line-number syntax +[include] + path = .gitconfig.local