Mercurial > ec-dotfiles
comparison rc/gitconfig @ 643:e852829c3f76
[git] default ff on pull
author | nanaya <me@nanaya.pro> |
---|---|
date | Mon, 29 Jun 2020 16:06:24 +0900 |
parents | b3f8b7a779bd |
children | 5b98946be635 |
comparison
equal
deleted
inserted
replaced
642:c548e83e4c57 | 643:e852829c3f76 |
---|---|
13 excludesfile = ~/.gitignore_global | 13 excludesfile = ~/.gitignore_global |
14 [diff] | 14 [diff] |
15 algorithm = patience | 15 algorithm = patience |
16 [log] | 16 [log] |
17 date = iso-local | 17 date = iso-local |
18 [pull] | |
19 ff = only |