From afdac0356ec9c9723e14b820867028249caeb117 Mon Sep 17 00:00:00 2001 From: nojhan Date: Wed, 11 Sep 2024 13:36:05 +0200 Subject: [PATCH] fix(gitconfig) --- .gitconfig | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitconfig b/.gitconfig index bae3de0..da3428b 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,6 +1,6 @@ [user] - name = nojhan - email = nojhan@nojhan.net + name = nojhan + email = nojhan@nojhan.net [alias] st = status ci = commit -v @@ -23,14 +23,17 @@ [push] default = simple [rebase] - instructionFormat = (%an <%ae>) %s + instructionFormat = (%an <%ae>) %s [credential] - helper = store + helper = store [pull] - rebase = true + rebase = true [diff "odf"] textconv=odt2txt [diff] - algorithm = histogram + algorithm = histogram [init] - defaultBranch = main + defaultBranch = main + +[includeIf "gitdir:~/travail/**"] + path = ~/travail/.gitconfig