X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/b6c44861a595efc20fc0963721134a677b7b8ce6..d8a4be5d3f2691d8948919bc1e32f58cbfaf1a2e:/git/config diff --git a/git/config b/git/config index f3865cf..f7e4f40 100644 --- a/git/config +++ b/git/config @@ -7,7 +7,7 @@ ui = auto diff = auto [push] - default = simple + default = current [diff] tool = vimdiff [color "diff"] @@ -29,3 +29,15 @@ [rebase] autostash = true autosquash = true +[status] + submodulesummary = true +[rerere] + enabled = true +[pull] + rebase = interactive +[branch "master"] + rebase = preserve +[branch "develop"] + rebase = preserve +[commit] + verbose = true