2023-01-13 10:17:52 +01:00
|
|
|
[advice]
|
|
|
|
addEmptyPathspec = false
|
2023-05-09 08:41:55 +02:00
|
|
|
addIgnoredFile = false
|
2023-06-07 09:44:58 +02:00
|
|
|
[alias]
|
|
|
|
jump = !/usr/share/git/git-jump/git-jump
|
2023-06-17 07:51:22 +02:00
|
|
|
# Based on https://stackoverflow.com/questions/5188320/how-can-i-get-a-list-of-git-branches-ordered-by-most-recent-commit
|
|
|
|
recent = "!rb() { \
|
|
|
|
git branch --all --color=always --sort=-committerdate \
|
|
|
|
--format='%(HEAD) %(color:bold green)%(committerdate:relative)%(color:reset)|%(color:yellow)%(refname:short)%(color:reset)|%(subject)' \
|
|
|
|
| head -n ${1:-15} | column -ts'|'; }; \
|
|
|
|
rb"
|
2023-01-13 10:17:52 +01:00
|
|
|
[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
|
2016-03-07 17:31:28 +01:00
|
|
|
[core]
|
2022-09-05 12:48:45 +02:00
|
|
|
editor = nvim
|
2020-04-16 06:45:30 +02:00
|
|
|
excludesfile = ~/.config/git/ignore
|
2020-09-25 11:25:57 +02:00
|
|
|
[diff]
|
2021-12-14 07:26:14 +01:00
|
|
|
tool = nvimdiff
|
2023-01-12 13:18:51 +01:00
|
|
|
context = 8
|
|
|
|
interHunkContext = 8
|
2022-01-04 14:52:45 +01:00
|
|
|
[difftool]
|
|
|
|
prompt = false
|
|
|
|
trustExitCode = true
|
2021-12-14 07:26:14 +01:00
|
|
|
[difftool "nvimdiff"]
|
2022-01-04 14:52:45 +01:00
|
|
|
cmd = nvim -R -d $LOCAL $REMOTE
|
2022-03-31 16:07:31 +02:00
|
|
|
[difftool "difftastic"]
|
|
|
|
cmd = difft $LOCAL $REMOTE
|
2022-01-04 14:52:45 +01:00
|
|
|
[difftool "kitty"]
|
2023-01-13 10:17:52 +01:00
|
|
|
cmd = kitty +kitten diff $LOCAL $REMOTE
|
|
|
|
[fetch]
|
|
|
|
prune = true
|
|
|
|
pruneTags = true
|
|
|
|
[http]
|
|
|
|
sslVerify = false
|
|
|
|
[init]
|
|
|
|
defaultBranch = master
|
|
|
|
[log]
|
|
|
|
follow = true
|
2020-02-16 13:24:11 +01:00
|
|
|
[merge]
|
2022-05-03 06:12:48 +02:00
|
|
|
tool = nvimdiff1
|
2022-05-03 05:56:36 +02:00
|
|
|
conflictstyle = zdiff3
|
2020-10-01 10:02:01 +02:00
|
|
|
ff = only
|
2020-09-17 07:05:16 +02:00
|
|
|
[mergetool]
|
|
|
|
prompt = false
|
2020-05-03 08:09:29 +02:00
|
|
|
keepBackup = false
|
2023-01-17 04:51:53 +01:00
|
|
|
hideResolved = false
|
|
|
|
[mergetool "nvimdiff1"]
|
|
|
|
hideResolved = true
|
2023-01-13 10:49:45 +01:00
|
|
|
[pager]
|
|
|
|
difftool = true
|
2020-06-13 10:45:10 +02:00
|
|
|
[pull]
|
|
|
|
rebase = false
|
2020-10-01 10:02:01 +02:00
|
|
|
[push]
|
2021-09-23 09:42:43 +02:00
|
|
|
default = nothing
|
2023-01-13 10:17:52 +01:00
|
|
|
[rebase]
|
|
|
|
autosquash = true
|
|
|
|
autoStash = true
|
|
|
|
updateRefs = true
|
|
|
|
[sendemail]
|
|
|
|
smtpserver = /usr/bin/msmtp
|
2022-12-16 15:35:56 +01:00
|
|
|
[user]
|
2023-01-13 10:17:52 +01:00
|
|
|
name = Sanchayan Maity
|
|
|
|
email = sanchayan@sanchayanmaity.net
|
|
|
|
login = sanchayanmaity
|
2022-12-16 15:35:56 +01:00
|
|
|
signingkey = 6F6A0609C12038F3
|