3 ms·
Does this have some kind of distinct result from rebasing the branch before merging does? I'm not thinking of anything that would be different, so I'm not sure
by stormbrew 5y ago
Does this have some kind of distinct result from rebasing the branch before merging does? I'm not thinking of anything that would be different, so I'm not sure if using the more obscure command (`git merge --no-commit` vs `git rebase`) is for a specific reason.
- Izkata 5y agoDid you mean to respond to someone else? I never mentioned --no-commit, I'm talking about rebasing if needed - set up a fast-forward merge, which may or may not need a rebase. This top-level comment shows what the commit history looks like doing what I said: https://news.ycombinator.com/item?id=27723435 https://news.ycombinator.com/item?id=27723435 I also didn't just say rebase because that could also mean squashing commits manually and isn't what I'm talking about.
- stormbrew 5y agoNo, I've just never heard rebasing a branch described as "setting up a fast-forward merge." It implies doing something very different to me from a straightforward rebase, though with this elaboration I can see how you could describe it that way.