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

Git: Cleanup

Browse Source
This commit is contained in:
Tobias Manske 2023-08-27 15:26:26 +02:00
parent 68f3460ab8
commit 3778c79643
Signed by: tobias
GPG Key ID: 9164B527694A0709
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git/.gitattributes vendored
View File

@ -1 +1,3 @@
*.* diff=delta *.* diff=delta
*.yaml diff=dyff
*.yml diff=dyff

14
git/.gitconfig
View File

@ -21,7 +21,7 @@
rebase = true rebase = true
[push] [push]
autoSetupRemote = true autoSetupRemote = true
default = current default = current
[interactive] [interactive]
diffFilter = delta --color-only diffFilter = delta --color-only
[delta] [delta]
@ -32,14 +32,12 @@
file-style = bold yellow ul file-style = bold yellow ul
file-decoration-style = none file-decoration-style = none
[hub] [hub]
protocol = https protocol = https
[credential] [credential]
helper = store helper = store
[init] [init]
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] [merge]
tool = smerge tool = smerge
[safe]
directory = /opt/flutter