diff --git a/git/.gitconfig b/git/.gitconfig index ac1ff37..780d0d7 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -1,13 +1,12 @@ -[user] - email = git@glfmn.io - name = Gwen Lofman [push] default = simple + [core] editor = "vi" excludesfile = ~/.gitignore_global attributesfile = ~/.gitattributes_global pager = delta --dark + [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f @@ -37,7 +36,6 @@ required = true fx = !git fixup # Grab a remote branch and track it get = checkout --track - gt = !git get # abbreviated commands st = status -sbu @@ -51,7 +49,7 @@ required = true ap = add -p ps = push pu = pull - ds = diff --stat + ds = diff --stat dc = diff --cached # logging commands @@ -73,7 +71,15 @@ required = true fll = !git lgl --follow -- # long-format commits fst = !git lst --follow -- # stat-style commits fpa = !git lpa --follow -- # full patch commits + [commit] verbose = true + [help] autocorrect = 10 + +[init] + defaultBranch = main + +[include] + path = ~/.gitconfig.user diff --git a/git/.gitconfig.user b/git/.gitconfig.user new file mode 100644 index 0000000..70bdaec --- /dev/null +++ b/git/.gitconfig.user @@ -0,0 +1,10 @@ +[user] + name = Gwen Lofman + email = git@glfmn.io + signingkey = git@glfmn.io + +[commit] + gpgSign = true + +[tag] + gpgSign = true diff --git a/setup.sh b/setup.sh index 7dd1d2e..0a42852 100755 --- a/setup.sh +++ b/setup.sh @@ -34,6 +34,7 @@ ln -sbv "$DIR/profiles/.alacritty.yml" ~ # Git echo -e "\n\t${BOLD}git...${NC}\n" ln -sbv "$DIR/git/.gitconfig" ~ +ln -sbv "$DIR/git/.gitconfig.user" ~ ln -sbv "$DIR/git/.gitignore_global" ~ ln -sbv "$DIR/git/.gitattributes_global" ~