Both approach seem to have the same purpose to have clean history:
No fast forward (
--no-ff
)
So, if I have done rebasing on a feature branch, do I still need --no-ff
when merging back to the main branch?
UPDATE:
It seems to me there is a confusion between rebasing, fast forward and non fast forward merging, basically diagram (fig 3.28) in this link http://git-scm.com/book/en/Git-Branching-Rebasing shows normal merge result is the same as merge --no-ff from the top answer of this link Why does git fast-forward merges by default?