Hacker News new | past | comments | ask | show | jobs | submit login

Did 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

I also didn't just say rebase because that could also mean squashing commits manually and isn't what I'm talking about.




No, 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.




Consider applying for YC's Spring batch! Applications are open till Feb 11.

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: