diff options
| author | Ben Harris <ben@tilde.team> | 2018-08-11 15:03:04 -0400 |
|---|---|---|
| committer | Ben Harris <ben@tilde.team> | 2018-08-11 16:40:55 -0400 |
| commit | d80339eaef7d5f07d07cb395c9d37b6fbe9e182f (patch) | |
| tree | 09e7ff6c27eff2b81e2bf99793a91f9731248270 /git | |
| parent | 079d737e01d71c84294a2b9a2a561ca26455ee3c (diff) | |
pull.ff only
Diffstat (limited to 'git')
| -rwxr-xr-x | git/.gitconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git/.gitconfig b/git/.gitconfig index a4d8591..92f196f 100755 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -6,3 +6,5 @@ default = simple [commit] gpgsign = true +[pull] + ff = only |