diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-09-12 16:16:38 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-09-12 16:16:38 +0100 |
| commit | 801868e3371f030d4265df93924e9d3ca90c4caf (patch) | |
| tree | 8831aa19d272bee21a9825311f9c9ba7bb18feab /.gitconfig | |
| parent | veritone ssh key (diff) | |
| download | dotfiles-801868e3371f030d4265df93924e9d3ca90c4caf.tar.gz dotfiles-801868e3371f030d4265df93924e9d3ca90c4caf.tar.bz2 dotfiles-801868e3371f030d4265df93924e9d3ca90c4caf.zip | |
nicer git diffs & rebases
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -39,13 +39,14 @@ renames = copies colorMoved = zebra [merge] - conflictstyle = diff3 + conflictstyle = zdiff3 [log] decorate = short date = iso [rebase] stat = true autosquash = true + updateRefs = true [rerere] enabled = true [transfer] |