Ask HN: What's the worst piece of software you use everyday?

Re:Ask HN: What's the worst piece of software you use everyday? by teraflop on Saturday July 11, 2020 @07:50PM (#23807261)

I think that's a bit of an exaggeration; "pull.rebase=true" should be fine as long as you don't have local merge commits that need to be rebased on top of someone else's changes. With ordinary commits, it shouldn't really matter how frequently you (or others) push.

[ Parent | on HN ]

Re:Ask HN: What's the worst piece of software you use everyday? by Izkata on Sunday July 12, 2020 @03:06PM (#23813842)

"git rebase" has --preserve-merges (apparently renamed to --rebase-merges a few years ago) to recreate those local merge commits, maybe it can be set somehow for this as well?

[ Parent | on HN ]

Re:Ask HN: What's the worst piece of software you use everyday? by jgmarcel on Friday July 17, 2020 @12:11PM (#23872062)

Exactly. That’s the default I use. You can set it via:

    git config --global pull.rebase merges

[ Parent | on HN ]