I can’t really ever think of a time when I would use git merge rather than git rebase and not want to have a commit show up. Is there any way to configure git to have fast forwarding off by default? The fact that there’s an –ff option would seem to imply that there’s a … Read more
Coming from mercurial, I use branches to organize features. Naturally, I want to see this work-flow in my history as well. I started my new project using git and finished my first feature. When merging the feature, I realized git uses fast-forward, i.e. it applies my changes directly to the master branch if possible and … Read more
Using gitk log, I could not spot a difference between the effect of git merge and git merge –no-ff. How can I observe the difference (with a git command or some tool)? 8
