Richard Lee <richard <at> webdezign.co.uk> writes: > So I tried using branches for features today. Most of the time I'm the only > person working on a project. So when I've finished working on a feature > branch and ready to merge it back into the master branch, the master head IS > the common ancestor of the two branches. As shown below > > * b6d75f1 [feature] stuff on feature branch > * 43dba08 stuff on feature branch > * ab7efdd [master] init > > When I merge the graph looks likes this: > > * b6d75f1 [master] [feature] stuff on feature branch > * 43dba08 stuff on feature branch > * ab7efdd init You're getting a so-called "fast-forward" merge, which is the default. Turn it off with: git merge --no-ff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html