diff options
| author | Maksymilian Jopek <maks@jopek.eu> | 2025-03-15 14:46:54 +0100 |
|---|---|---|
| committer | Maksymilian Jopek <maks@jopek.eu> | 2025-03-15 14:46:54 +0100 |
| commit | d7c8b912e63c9a112d75f6b9e2e3f5d3c6975240 (patch) | |
| tree | 8731b82a7d16240d3fea1175d02f55dd15e2abf2 /.config/git/config | |
| parent | 5f385da9f686ffb9ab61c194a46539cbe53357ea (diff) | |
| download | eibhear-d7c8b912e63c9a112d75f6b9e2e3f5d3c6975240.tar.gz eibhear-d7c8b912e63c9a112d75f6b9e2e3f5d3c6975240.tar.zst eibhear-d7c8b912e63c9a112d75f6b9e2e3f5d3c6975240.zip | |
Eibhear: Initial commit
Some file deletion, small changes, some addition
Diffstat (limited to '.config/git/config')
| -rw-r--r-- | .config/git/config | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config new file mode 100644 index 0000000..6f7086d --- /dev/null +++ b/.config/git/config @@ -0,0 +1,15 @@ +[core] + pager = delta + +[interactive] + diffFilter = delta --color-only + +[delta] + navigate = true # use n and N to move between diff sections + dark = true # or light = true, or omit for auto-detection + side-by-side = true + +[merge] + conflictstyle = zdiff3 +[init] + defaultBranch = master |