1

Git - merge (defalut vs no-fast-forward)

view story
linux-howto

http://forums.fedoraforum.org – I am trying to understand git and the way it merges. I have been looking at http://nvie.com/posts/a-successful-git-branching-model/ which was recommended to me as a logical workflow. It does seem logical, however; When I play around with git and some test files I see no difference between "git merge", and "git merge --no-ff". My first thought when looking at this is that on branch=master, when I do "git log" all I would see is commits stating that a merge was done from dev/release branch. However, this is not what I see; Am I missing the point? I really ca (HowTos)