millironx/dotfiles
1
0
Fork 0
mirror of https://github.com/MillironX/dotfiles.git synced 2024-11-21 21:26:04 +00:00
Code Issues Releases Packages Activity

Add default merge mode to gitconfig

Browse source 
Signed-off-by: Thomas A. Christensen II <25492070+MillironX@users.noreply.github.com>
This commit is contained in:
Thomas A. Christensen II 2021-12-15 10:15:04 -06:00
parent 1371471497
commit 0043e59068
Signed by: millironx
GPG key ID: 139C07724802BC5D
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
executable_dot_gitconfig.tmpl
View file

@ -12,6 +12,8 @@
defaultBranch = master defaultBranch = master
[github] [github]
user = MillironX user = MillironX
[pull]
rebase = false
{{- if eq .chezmoi.osRelease.id "fedora" }} {{- if eq .chezmoi.osRelease.id "fedora" }}
[diff] [diff]
tool = kdiff3 tool = kdiff3