Skip to content

Commit

Permalink
git: only set zdiff3 on macos.
Browse files Browse the repository at this point in the history
  • Loading branch information
TechDufus committed Dec 31, 2024
1 parent 3b8130c commit 1728fac
Showing 1 changed file with 32 additions and 0 deletions.
32 changes: 32 additions & 0 deletions roles/git/tasks/MacOSX.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,35 @@
community.general.homebrew:
name: git-delta
state: present

- name: "Git | Set [delta] config"
block:
- name: "Git | Set core.pager"
community.general.git_config:
name: core.pager
scope: global
value: "delta"

- name: "Git | Set delta interactive.diffFilter"
community.general.git_config:
name: delta.interactive.diffFilter
scope: global
value: "delta --color-only --features=interactive"

- name: "Git | Set Delta Negative"
community.general.git_config:
name: delta.negative
scope: global
value: true

- name: "Git | Set Delta Side-by-Side"
community.general.git_config:
name: delta.side-by-side
scope: global
value: true

- name: "Git | Set merge.conflictStyle"
community.general.git_config:
name: merge.conflictStyle
scope: global
value: zdiff3

0 comments on commit 1728fac

Please sign in to comment.