diff options
| author | Ibrahim Muftee <ibrahim@muftee.net> | 2024-04-22 21:08:10 -0500 |
|---|---|---|
| committer | Ibrahim Muftee <ibrahim@muftee.net> | 2026-07-01 00:23:31 -0400 |
| commit | 8bd9d120477889179aff683c7f8e396bbbc77656 (patch) | |
| tree | deb7b95266013d8c41dc989b86da000a49025558 | |
| parent | 9e0f48e3d704f76564603f0047ed69d697715cb5 (diff) | |
fix(git): always merge when pulling
| -rw-r--r-- | dot_gitconfig.tmpl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl index 0498692..b896ca7 100644 --- a/dot_gitconfig.tmpl +++ b/dot_gitconfig.tmpl @@ -35,3 +35,5 @@ helper = helper = !/usr/bin/gh auth git-credential {{ end -}} +[pull] + rebase = false |