From f850f3431f8db6880563ff54435e86d4fa6a1132 Mon Sep 17 00:00:00 2001 From: binaryDiv Date: Wed, 2 Jun 2021 17:54:14 +0200 Subject: [PATCH] .gitconfig: Add options and aliases for git submodules --- .gitconfig.inc/common.gitconfig | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.gitconfig.inc/common.gitconfig b/.gitconfig.inc/common.gitconfig index 0c6824c..1d70d49 100644 --- a/.gitconfig.inc/common.gitconfig +++ b/.gitconfig.inc/common.gitconfig @@ -7,14 +7,24 @@ [pull] ff = only +[push] + recurseSubmodules = check + +[submodule] + recurse = true + [pager] branch = false config = false stash = false +[status] + submodulesummary = 1 + [diff] tool = vimdiff guitool = gvimdiff + submodule = log [diff "ansible-vault"] textconv = ansible-vault view @@ -45,3 +55,6 @@ # Reset HEAD to last commit, but keep files as they are undo = reset HEAD~1 --mixed + + # Submodule helpers + sm-update = submodule update --init --recursive --remote --merge