dotfiles/git/.gitconfig

[user]
	name = Sanchayan Maity
	email = sanchayan@sanchayanmaity.net
	login = sanchayanmaity
[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
[difftool]
	prompt = false
	trustExitCode = true
[difftool "nvimdiff"]
	cmd = nvim -R -d $LOCAL $REMOTE
[difftool "difftastic"]
	cmd = difft $LOCAL $REMOTE
[difftool "kitty"]
    cmd = kitty +kitten diff $LOCAL $REMOTE
[merge]
	tool = nvimdiff1
	conflictstyle = zdiff3
	ff = only
[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
[user]
	signingkey = 6F6A0609C12038F3
Initial commit of dotfiles 2016-03-07 17:31:28 +01:00			`[user]`
			`name = Sanchayan Maity`
git: Update to use our own email id 2021-02-11 18:49:38 +01:00			`email = sanchayan@sanchayanmaity.net`
git: Update gitconfig Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> 2019-12-31 10:29:43 +01:00			`login = sanchayanmaity`
Initial commit of dotfiles 2016-03-07 17:31:28 +01:00			`[core]`
Revert "fish/git: Manually set file type to git when calling nvim" This reverts commit 2102b9983bcdc55b74ab706dca14025eeb50e795. Guess this got fixed in upstream commit 927d4d2. 2022-09-05 12:48:45 +02:00			`editor = nvim`
git: Use a global gitignore Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> 2020-04-16 06:45:30 +02:00			`excludesfile = ~/.config/git/ignore`
Initial commit of dotfiles 2016-03-07 17:31:28 +01:00			`[color]`
git: Some updates based on delta's README 2020-09-25 11:25:57 +02:00			`ui = true`
Initial commit of dotfiles 2016-03-07 17:31:28 +01:00			`[sendemail]`
			`smtpserver = /usr/bin/msmtp`
git: Update gitconfig Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> 2019-12-31 10:29:43 +01:00			`[http]`
			`sslVerify = false`
git: Set fetch.prune globally Automatically delete remote tracking local branches that have been removed from remote. This makes pruning references part of our normal work flow. Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> 2020-09-18 08:02:05 +02:00			`[fetch]`
			`prune = true`
git: Prune tags by default on fetch 2020-10-05 14:28:25 +02:00			`pruneTags = true`
git: Some updates based on delta's README 2020-09-25 11:25:57 +02:00			`[diff]`
git: Use neovim as our diff tool and pager 2021-12-14 07:26:14 +01:00			`tool = nvimdiff`
git: Add support for using kitty as a difftool While at it drop unnecessary double quotes. 2022-01-04 14:52:45 +01:00			`[difftool]`
			`prompt = false`
			`trustExitCode = true`
git: Use neovim as our diff tool and pager 2021-12-14 07:26:14 +01:00			`[difftool "nvimdiff"]`
git: Add support for using kitty as a difftool While at it drop unnecessary double quotes. 2022-01-04 14:52:45 +01:00			`cmd = nvim -R -d $LOCAL $REMOTE`
git: Add difftastic as a difftool option 2022-03-31 16:07:31 +02:00			`[difftool "difftastic"]`
			`cmd = difft $LOCAL $REMOTE`
git: Add support for using kitty as a difftool While at it drop unnecessary double quotes. 2022-01-04 14:52:45 +01:00			`[difftool "kitty"]`
			`cmd = kitty +kitten diff $LOCAL $REMOTE`
git: Use vim-mergetool for merge conflicts Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> 2020-02-16 13:24:11 +01:00			`[merge]`
git: Use nvimdiff1 as the merge tool The feature provided by the vim-diffconflicts plugin seems to have been merged upstream. Use of nvimdiff1 should now suffice. See https://www.eseth.org/2020/mergetools.html There also seems to be a new proposal adding layout support which will be interesting once merged. https://lore.kernel.org/all/20220327112307.151044-1-greenfoo@u92.eu/ 2022-05-03 06:12:48 +02:00			`tool = nvimdiff1`
git: Use zealous diff3 style of merge conflict presentation This is only available from git 2.35. A description of how this works is in the original commit. https://github.com/git/git/commit/4496526f80b3e4952036550b279eff8d1babd60a 2022-05-03 05:56:36 +02:00			`conflictstyle = zdiff3`
git: Some improvements to git configuration Use fast forward only for merge, auto stash when doing rebase and take care of tags when doing a push. 2020-10-01 10:02:01 +02:00			`ff = only`
nvim/git: Use vimdiff as merge tool & drop DiffConflicts The conflict markers plugin is what we have been using all the time and is useful even without resorting to merge tool. Drop the DiffConflicts plugin and use vimdiff as the merge tool if at all we need to resort to a full 3 way merge view. Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> 2020-09-17 07:05:16 +02:00			`[mergetool]`
			`prompt = false`
nvim: Remove mergetool and switch to DiffConflicts for git merge Also add the conflict-marker plugin. This should also be useful for doing rebases and resolving conflicts. Might drop one later if one of them serves all the purposes in all cases. While at it, add unimpaired style bindings for moving between tabs. This is required since :DiffConflictsShowHistory opens a new tab and default tab navigation bindings gt/gT at least are binded to something else in python. Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> 2020-05-03 08:09:29 +02:00			`keepBackup = false`
git: Some improvements to git configuration Use fast forward only for merge, auto stash when doing rebase and take care of tags when doing a push. 2020-10-01 10:02:01 +02:00			`[rebase]`
git: Set auto squash for rebase by default and addEmptyPathspec to false 2021-01-28 08:32:34 +01:00			`autosquash = true`
git: Some improvements to git configuration Use fast forward only for merge, auto stash when doing rebase and take care of tags when doing a push. 2020-10-01 10:02:01 +02:00			`autoStash = true`
git: Enable updateRefs by default for rebase The feature is explained here https://github.blog/2022-10-03-highlights-from-git-2-38/#rebase-dependent-branches-with-update-refs 2022-11-04 05:45:00 +01:00			`updateRefs = true`
git: gitconfig: Always use verbose for commits Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> 2020-05-21 06:57:17 +02:00			`[commit]`
			`verbose = true`
git: gitconfig: Use merge as default strategy for git pull git config pull.rebase false # merge (the default strategy) git config pull.rebase true # rebase git config pull.ff only # fast-forward only Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> 2020-06-13 10:45:10 +02:00			`[pull]`
			`rebase = false`
git: Some improvements to git configuration Use fast forward only for merge, auto stash when doing rebase and take care of tags when doing a push. 2020-10-01 10:02:01 +02:00			`[push]`
git: Set push.default Do not push anything (error out) unless a refspec is given. We want to avoid mistakes by always being explicit. See https://git-scm.com/docs/git-config#Documentation/git-config.txt-pushdefault 2021-09-23 09:42:43 +02:00			`default = nothing`
git: Set auto squash for rebase by default and addEmptyPathspec to false 2021-01-28 08:32:34 +01:00			`[advice]`
			`addEmptyPathspec = false`
git: Set default branch 2021-02-02 05:09:23 +01:00			`[init]`
			`defaultBranch = master`
git: Continue listing the history of a file beyond renames 2021-10-20 14:31:08 +02:00			`[log]`
			`follow = true`
git: Global blame settings 2022-04-12 14:15:02 +02: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`
git: Add signing key 2022-12-16 15:35:56 +01:00			`[user]`
			`signingkey = 6F6A0609C12038F3`