tobias/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Git: mergetool, autoSetupRemote

Browse Source
This commit is contained in:
Tobias Manske 2022-11-02 19:14:51 +01:00
parent d6cd2fa426
commit ae5d666715
Signed by: tobias
GPG Key ID: E83C743C1FC2F79A
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitconfig
View File

@ -19,11 +19,12 @@
user = rad4day user = rad4day
[pull] [pull]
rebase = true rebase = true
[push]
autoSetupRemote = true
[interactive] [interactive]
diffFilter = delta --color-only diffFilter = delta --color-only
[delta] [delta]
features = line-numbers decorations features = line-numbers decorations
syntax-theme = OneHalfDark
whitespace-error-style = 22 reverse whitespace-error-style = 22 reverse
[delta "decorations"] [delta "decorations"]
commit-decoration-style = bold yellow box ul commit-decoration-style = bold yellow box ul
@ -37,3 +38,5 @@
defaultBranch = main defaultBranch = main
[diff "dyff"] [diff "dyff"]
command = "dyff_between() { dyff --color on between --omit-header \"$2\" \"$5\"; }; dyff_between" command = "dyff_between() { dyff --color on between --omit-header \"$2\" \"$5\"; }; dyff_between"
[merge]
tool = smerge