dotfiles/git/.gitconfig

[user]
	name = Sanchayan Maity
	email = maitysanchayan@gmail.com
	login = sanchayanmaity
[core]
	editor = "nvim"
	pager = delta --dark
	excludesfile = ~/.config/git/ignore
[color]
	ui = auto
[sendemail]
	smtpserver = /usr/bin/msmtp
[http]
	sslVerify = false
[merge]
	tool = vimdiff
	conflictstyle = diff3
[mergetool]
	prompt = false
[mergetool "vimdiff"]
	cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
	trustExitCode = true
	keepBackup = false
[commit]
	verbose = true
[pull]
	rebase = false
Initial commit of dotfiles 2016-03-07 17:31:28 +01:00			`[user]`
			`name = Sanchayan Maity`
			`email = maitysanchayan@gmail.com`
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"`
			`pager = delta --dark`
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]`
			`ui = auto`
			`[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: Use vim-mergetool for merge conflicts Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> 2020-02-16 13:24:11 +01:00			`[merge]`
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			`tool = vimdiff`
			`conflictstyle = diff3`
			`[mergetool]`
			`prompt = false`
			`[mergetool "vimdiff"]`
			`cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'`
git: Use vim-mergetool for merge conflicts Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> 2020-02-16 13:24:11 +01:00			`trustExitCode = true`
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: 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`