A git alias I use is "git preb", which stands for "pull with rebase". It rebases my commits on top of origin using a merge algorithm, which is smarter than the

A git alias I use is "git preb", which stands for "pull with rebase". It rebases my commits on top of origin using a merge algorithm, which is smarter than the default which uses patches and often causes merge conflicts. Its definition is - iirc, typing this on my mobile - "pull --rebase -s recursive". Now I don't push any useless merge commits like "Merge origin/develop into develop".