4 ms·
The tip about using "--no-ff" for feature branch merges is really useful. Why ISN'T that the default.
by akent 16y ago
The tip about using "--no-ff" for feature branch merges is really useful. Why ISN'T that the default.
- antirez 16y agoI'm not sure I understand --no-ff very well, but if with it you lose the feature branch sub-commits this is why it is not the default I guess.
- kyleslattery 16y ago--no-ff doesn't get rid of the individual commits, it just guarantees that a merge commit gets created as well, so it's easy to see what branch was merged in. If you don't use it and the commits you're merging in can be applied via fast forward, it skips creating the merge commit.
- antirez 16y agooh I see, thank you. But then the graphics on the article is misleading I guess...