diff --git a/.config/git/config b/.config/git/config index 28de9aa..ce37999 100644 --- a/.config/git/config +++ b/.config/git/config @@ -19,6 +19,9 @@ [mergetool] # I don't need the backups of a merge keepBackup = false +[rebase] + # stash changes before merging remote changes this is very handy in conjunction with "pull.rebase=true" + autoStash = true [merge] # stash changes before merging remote changes this is very handy in conjunction with "pull.rebase=true" autoStash = true