diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-09-12 16:16:38 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-09-13 20:43:37 +0100 |
| commit | 152ae36faffd55c9ea665fef5690c4a2f1b98ad6 (patch) | |
| tree | e65ff3aa7dff688192cf10a61f8de15284a3a252 | |
| parent | teach ack about ebuilds (diff) | |
| download | dotfiles-152ae36faffd55c9ea665fef5690c4a2f1b98ad6.tar.gz dotfiles-152ae36faffd55c9ea665fef5690c4a2f1b98ad6.tar.bz2 dotfiles-152ae36faffd55c9ea665fef5690c4a2f1b98ad6.zip | |
nicer git diffs & rebases
| -rw-r--r-- | .gitconfig | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -37,13 +37,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] |