diff options
| author | Gianni Ceccarelli <gianni.ceccarelli@broadbean.com> | 2021-09-21 13:52:20 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-06-02 13:28:37 +0100 |
| commit | c1c249b4843d8cbe432aff997aaa97b8a809c8dd (patch) | |
| tree | 4d0e1bab28694084932bf7873532fd9d64e6e6ba | |
| parent | better less colors on dark bg (diff) | |
| download | dotfiles-c1c249b4843d8cbe432aff997aaa97b8a809c8dd.tar.gz dotfiles-c1c249b4843d8cbe432aff997aaa97b8a809c8dd.tar.bz2 dotfiles-c1c249b4843d8cbe432aff997aaa97b8a809c8dd.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] |