Skip to content

Commit

Permalink
Update README.md to include git 2.37.0 workaround
Browse files Browse the repository at this point in the history
  • Loading branch information
cwlbraa authored Jul 1, 2022
1 parent 1dab1a8 commit bb9c8ba
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@

[interactive]
diffFilter = delta --color-only
[add.interactive]
useBuiltin = false # required for git 2.37.0

[delta]
navigate = true # use n and N to move between diff sections
light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
navigate = true # use n and N to move between diff sections
light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)

[merge]
conflictstyle = diff3
Expand Down

0 comments on commit bb9c8ba

Please sign in to comment.