codeweaver/.gitconfig at main · knitli/codeweaver · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35

# repo-level .gitconfig to setup git drivers for codeweaver
[core]
    attributesfile = .gitattributes
    excludesfile = .gitignore
    autocrlf = false
    symlinks = true

[alias]
    root = "rev-parse --show-toplevel"

    # Difftastic aliases, so `git dlog` is `git log` with difftastic and so on.
    dlog = -c diff.external=difft log --ext-diff
    dshow = -c diff.external=difft show --ext-diff
    ddiff = -c diff.external=difft diff
    # `git log` with patches shown with difftastic.
    dl = -c diff.external=difft log -p --ext-diff

    # Show the most recent commit with difftastic.
    ds = -c diff.external=difft show --ext-diff

    # `git diff` with difftastic.
    dft = -c diff.external=difft diff

[diff]
  external = difft
  tool = difftastic

[merge "ours"]
    name = "Keep ours merge"
    driver = true

[merge "latest_version"]
    name = "Ensures the later version of the version file (_version.py) is kept."
    driver = "./scripts/build/git-merge-latest-version.py %O %A %B"