Mastodon Feed: Post

Reblogged by keul@fosstodon.org ("Luca Fabbri"):

castarco@hachyderm.io ("Andreu Casablanca 🐀") wrote:

Some #git config values I always set in my #dev environments:

```
# For better rebasing experience
git config --global rerere.enabled true

git config --global rebase.updateRefs true

# For better diffs & conflict resolution
git config --global diff.algorithm histogram

git config --global merge.conflictstyle zdiff3
```