From 7f086ca74a9402899238c6dda003c1db1e72d5b4 Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Fri, 13 Jan 2023 14:47:52 +0530 Subject: [PATCH] git: Arrange alphabetically for sanity --- .git-blame-ignore-revs | 2 ++ git/.gitconfig | 61 +++++++++++++++++++++--------------------- 2 files changed, 32 insertions(+), 31 deletions(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index c55ece6..599a098 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,4 @@ # Clean up with fish_indent 478fede9e42221d608f4da7d71490cdfdab7c8be +# Git sort settings alphabetically +507b16fc152837aabafc5efae41b316183a468cb diff --git a/git/.gitconfig b/git/.gitconfig index 7020e57..e27d50d 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -1,19 +1,17 @@ -[user] - name = Sanchayan Maity - email = sanchayan@sanchayanmaity.net - login = sanchayanmaity +[advice] + addEmptyPathspec = false +[blame] + # Mark any lines that have had a commit skipped using --ignore-rev with a `?` + markIgnoredLines = true + # Mark any lines that were added in a skipped commit and can not be attributed with a `*` + markUnblamableLines = true +[color] + ui = true +[commit] + verbose = true [core] editor = nvim excludesfile = ~/.config/git/ignore -[color] - ui = true -[sendemail] - smtpserver = /usr/bin/msmtp -[http] - sslVerify = false -[fetch] - prune = true - pruneTags = true [diff] tool = nvimdiff context = 8 @@ -26,7 +24,16 @@ [difftool "difftastic"] cmd = difft $LOCAL $REMOTE [difftool "kitty"] - cmd = kitty +kitten diff $LOCAL $REMOTE + cmd = kitty +kitten diff $LOCAL $REMOTE +[fetch] + prune = true + pruneTags = true +[http] + sslVerify = false +[init] + defaultBranch = master +[log] + follow = true [merge] tool = nvimdiff1 conflictstyle = zdiff3 @@ -34,26 +41,18 @@ [mergetool] prompt = false keepBackup = false -[rebase] - autosquash = true - autoStash = true - updateRefs = true -[commit] - verbose = true [pull] rebase = false [push] default = nothing -[advice] - addEmptyPathspec = false -[init] - defaultBranch = master -[log] - follow = true -[blame] - # Mark any lines that have had a commit skipped using --ignore-rev with a `?` - markIgnoredLines = true - # Mark any lines that were added in a skipped commit and can not be attributed with a `*` - markUnblamableLines = true +[rebase] + autosquash = true + autoStash = true + updateRefs = true +[sendemail] + smtpserver = /usr/bin/msmtp [user] + name = Sanchayan Maity + email = sanchayan@sanchayanmaity.net + login = sanchayanmaity signingkey = 6F6A0609C12038F3