diff options
| author | Gianni Ceccarelli <gianni.ceccarelli@broadbean.com> | 2021-09-21 13:52:20 +0100 |
|---|---|---|
| committer | Gianni Ceccarelli <gianni.ceccarelli@broadbean.com> | 2021-09-21 13:52:20 +0100 |
| commit | 011e27ac352b6d0c20c6a8710480a012668747c9 (patch) | |
| tree | 8b9cab9c5d72e44b88bc66c96fba2540c88ceb27 | |
| parent | nicer rxvt "transparency" settings (diff) | |
| download | dotfiles-011e27ac352b6d0c20c6a8710480a012668747c9.tar.gz dotfiles-011e27ac352b6d0c20c6a8710480a012668747c9.tar.bz2 dotfiles-011e27ac352b6d0c20c6a8710480a012668747c9.zip | |
nicer merge/rebase git config
| -rw-r--r-- | .gitconfig | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -38,12 +38,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] |