dotfiles/git/.gitconfig

[user]
	name = Sanchayan Maity
	email = sanchayan@sanchayanmaity.net
	login = sanchayanmaity
[core]
	editor = "nvim"
	pager = nvim -R
	excludesfile = ~/.config/git/ignore
[color]
	ui = true
	pager = no
[sendemail]
	smtpserver = /usr/bin/msmtp
[http]
	sslVerify = false
[fetch]
	prune = true
	pruneTags = true
[diff]
	tool = nvimdiff
[difftool "nvimdiff"]
	cmd = nvim -R -d "$LOCAL" "$REMOTE"
[merge]
	tool = diffconflicts
	conflictstyle = diff3
	ff = only
[mergetool]
	prompt = false
	keepBackup = false
[mergetool "diffconflicts"]
	cmd = nvim -c DiffConflicts "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
	trustExitCode = true
[rebase]
	autosquash = true
	autoStash = true
[commit]
	verbose = true
[pull]
	rebase = false
[push]
	default = nothing
[advice]
	addEmptyPathspec = false
[init]
	defaultBranch = master
[log]
	follow = true
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]`
git: Update gitconfig Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> 2019-12-31 10:29:43 +01:00			`editor = "nvim"`
git: Use neovim as our diff tool and pager 2021-12-14 07:26:14 +01:00			`pager = nvim -R`
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`
git: Use neovim as our diff tool and pager 2021-12-14 07:26:14 +01:00			`pager = no`
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`
			`[difftool "nvimdiff"]`
			`cmd = nvim -R -d "$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/nvim: Switch to using diffconflicts for resolving merge conflicts While we dropped diffconflicts earlier and switch to vanilla vimdiff, two way merges are definitely better than three way merges. 3 way merge as in gina or vimdiff is extremely confusing except for may be the simplest of merge conflicts. conflict-marker and diffconflicts should let us handle all cases. 2020-12-19 10:27:25 +01:00			`tool = diffconflicts`
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			`conflictstyle = diff3`
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/nvim: Switch to using diffconflicts for resolving merge conflicts While we dropped diffconflicts earlier and switch to vanilla vimdiff, two way merges are definitely better than three way merges. 3 way merge as in gina or vimdiff is extremely confusing except for may be the simplest of merge conflicts. conflict-marker and diffconflicts should let us handle all cases. 2020-12-19 10:27:25 +01:00			`[mergetool "diffconflicts"]`
git: Fix merge tool command 2021-04-28 09:59:17 +02:00			`cmd = nvim -c DiffConflicts "$MERGED" "$BASE" "$LOCAL" "$REMOTE"`
git/nvim: Switch to using diffconflicts for resolving merge conflicts While we dropped diffconflicts earlier and switch to vanilla vimdiff, two way merges are definitely better than three way merges. 3 way merge as in gina or vimdiff is extremely confusing except for may be the simplest of merge conflicts. conflict-marker and diffconflicts should let us handle all cases. 2020-12-19 10:27:25 +01:00			`trustExitCode = 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			`[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: 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`