view gitconfig @ 152:510c38f1cfc2

Add helpful Git defaults for branch, pull/merge and publishing Also includes a broken command to try and alias adding to DVC since it always gives you a command to run
author IBBoard <dev@ibboard.co.uk>
date Tue, 11 Jan 2022 20:48:33 +0000
parents c3320f06d412
children
line wrap: on
line source

[user]
	name = IBBoard
	email = dev@ibboard.co.uk
[core]
	excludesfile = ~/.gitignore
[branch]
	autosetupmerge = true
[diff]
[merge]
	tool = meld
[mergetool "meld"]
	cmd = meld \\\"$BASE\\\" \\\"$LOCAL\\\" \\\"$REMOTE\\\"
[diff]
	tool = meld
[difftool "meld"]
	cmd = meld \"\" \"\"
[difftool]
	prompt = false
[push]
	default = simple
[include]
    path = ~/.gitconfig-override
[pull]
	rebase = true
[alias]
	publish = push -u origin HEAD
#	dadd = "!dvc_add() { DVC_FILES=$(echo $@ | sed 's/\( |$\)/.dvc /g'); dvc add $@ && git add .gitignore $DVC_FILES; }; dvc_add"
[init]
	defaultBranch = main