Fast-forward Questions

What is the difference between a fast-forwarded git merge and a git rebase? don't both accomplish keeping history linear

I'm new to git as part of an online course i'm doing. currently doing a tutorial, and when i am getting the following error message when

Since some people recommend no fast-fordward (--no-ff) on merges in git, i wanted to do that. but i can't see where to check to enable that in the

I'm merging a hotfix branch into master. when i do a simple git merge hotfix-2.09 the merge fast-forwards but i'm getting a

For some reason, i have following situation:

I have two branches, and i am merging branch1 into branch2 with a no fast-forward. after the merge, i run the command 'git show', i only

I periodically get message from git that look like this: your branch is behind the tracked remote branch 'local-master/master' by

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