diff --git a/home-manager/git.nix b/home-manager/git.nix index 30ab0a5..32b1414 100644 --- a/home-manager/git.nix +++ b/home-manager/git.nix @@ -9,11 +9,13 @@ diff.external = "difft --background light"; diff.tool = "difftastic"; + diff.ignoreSubmodules = "none"; difftool.difftastic.cmd = "difft --background light \"$LOCAL\" \"$REMOTE\""; difftool.prompt = false; fetch.writeCommitGraph = true; + fetch.recurseSubmodules = true; format.pretty = "format:%C(yellow)%h %Cblue%>(12)%ad %C(red)%G? %Cgreen%<(7,trunc)%aN%Cred%d %Creset%s"; @@ -30,10 +32,16 @@ pull.rebase = true; + push.recurseSubmodules = "on-demand"; + rebase.autostash = true; rerere.enabled = true; + status.submoduleSummary = true; + + submodule.recurse = true; + user.private.email = "mandlm@molez.net"; user.private.name = "Michael Mandl"; user.private.signingkey = "4AA25D647AA54CC7";