diff options
| author | Gianni Ceccarelli <gianni.ceccarelli@broadbean.com> | 2021-09-21 13:52:20 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2021-09-24 11:41:52 +0100 |
| commit | 1fc3d354db134d3e8e43771f6f66c200643962f1 (patch) | |
| tree | e9aaa32f88b364be5befa66bcb9015a9e9232c4e | |
| parent | add raku to path (diff) | |
| download | dotfiles-1fc3d354db134d3e8e43771f6f66c200643962f1.tar.gz dotfiles-1fc3d354db134d3e8e43771f6f66c200643962f1.tar.bz2 dotfiles-1fc3d354db134d3e8e43771f6f66c200643962f1.zip | |
nicer merge/rebase git config
| -rw-r--r-- | .gitconfig | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -36,12 +36,16 @@ mnemonicprefix = true renames = copies colorMoved = zebra +[merge] + conflictstyle = diff3 [log] decorate = short date = iso [rebase] stat = true autosquash = true +[rerere] + enabled = true [transfer] #fsckobjects = true [grep] |