git: Arrange alphabetically for sanity
This commit is contained in:
parent
7c57397ae6
commit
7f086ca74a
2 changed files with 32 additions and 31 deletions
|
@ -1,2 +1,4 @@
|
|||
# Clean up with fish_indent
|
||||
478fede9e42221d608f4da7d71490cdfdab7c8be
|
||||
# Git sort settings alphabetically
|
||||
507b16fc152837aabafc5efae41b316183a468cb
|
||||
|
|
|
@ -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
|
||||
|
@ -27,6 +25,15 @@
|
|||
cmd = difft $LOCAL $REMOTE
|
||||
[difftool "kitty"]
|
||||
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
|
||||
|
|
Loading…
Reference in a new issue