diff options
Diffstat (limited to 'git/gitconfig.mi5')
| -rw-r--r-- | git/gitconfig.mi5 | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/git/gitconfig.mi5 b/git/gitconfig.mi5 index 292ffe7a..11b815d1 100644 --- a/git/gitconfig.mi5 +++ b/git/gitconfig.mi5 @@ -1,34 +1,37 @@ [commit] - status = false + status = false + +[diff] + algorithm = patience [fetch] - output = compact + output = compact [init] - templateDir = ~/.git-template + templateDir = ~/.git-template [log] - date = local - decorate = short + date = local + decorate = short [merge] - ff = false - log = 1024 + ff = false + log = 1024 [pull] - ff = only + ff = only [push] - default = current + default = current [sendemail] - confirm = compose - smtpServer = <% SENDMAIL %> + confirm = compose + smtpServer = <% SENDMAIL %> [status] - short = true + short = true [user] - name = <% NAME %> - email = <% EMAIL %> - signingKey = <% KEY %> + name = <% NAME %> + email = <% EMAIL %> + signingKey = <% KEY %> |