diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2019-06-14 23:00:25 +1200 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-06-14 23:00:25 +1200 |
| commit | 08f1b6525c50bd88a45a310b0fcac3f9ec58dd74 (patch) | |
| tree | fdf87dfe1f22a55e0ad272df955db73a96e9b6ed /git | |
| parent | Merge branch 'release/v6.1.0' (diff) | |
| parent | Bump VERSION (diff) | |
| download | dotfiles-6.2.0.tar.gz (sig) dotfiles-6.2.0.zip | |
Merge branch 'release/v6.2.0'v6.2.0
* release/v6.2.0: (22 commits)
Spruce up CSV and TSV Vim filetype scripts
Add explanatory comment on Vim indent ftplugin
Remove unneeded password filetype
Use tabs for Git configuration files
Fix layout of vim-keep-position submodule config
Replace and refactor Vim paste plugins
Move autocmd definitions out of augroup block
Refactor colorscheme select with cursorline hooks
Restore Git diff.algorithm to 'patience'
Tweak a comment about jetpack mapping
Add Vim leader maps for :command and :function
Add -bar attribute to :AddLocalSpellFile command
Add missing b:undo_ftplugin commands for ft=mail
Remove resolved issue from ISSUES.md list
Wrap mail quote cleanup in command-func
Move to body text correctly for start guesser
Wrap mail starting point guesser in command-func
Use more idiomatic check for empty string
Ensure we're in body text before breaking quotes
...
Diffstat (limited to 'git')
| -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 %> |