Top "Fast-forward" questions

Fast-forward term refer to DVCS merge technique.

What is the difference between `git merge` and `git merge --no-ff`?

Using gitk log, I could not spot a difference between the two. How can I observe the difference (with a …

git merge fast-forward
Why does git perform fast-forward merges by default?

Coming from mercurial, I use branches to organize features. Naturally, I want to see this work-flow in my history as …

git git-branch git-merge fast-forward
Can I make fast forwarding be off by default in git?

I can't really ever think of a time when I would use git merge rather than git rebase and not …

git merge branch rebase fast-forward
Prevent commits in master branch

(For simplicity) I have a master branch and a dev in my Git-repo. I want to ensure the master branch …

git merge fast-forward
When to use the '--no-ff' merge option in Git

A Successful Git Branching Model recommends to use --no-ff when merging branches: The --no-ff flag causes the merge to always …

git git-merge fast-forward
What are the differences between `--squash` and `--no-ff --no-commit`?

Which one should one use to hide microcommits? Is the only difference between git merge --squash and git merge --no-ff …

git merge git-merge fast-forward squash
How can I fast-forward a single git commit, programmatically?

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

git git-pull fast-forward
What does Fast-forward mean when pulling from remote?

I run git pull twice and get the following out: $ git pull remote: Counting objects: 1, done. remote: Total 1 (delta 0), reused 0 (…

git git-pull fast-forward
! [rejected] master -> master (non-fast-forward) on a new up-to-date branch

In my repo, I have a master branch, and a new branch. I've been working on new for a while, …

git github git-push git-pull fast-forward
git rebase master then push origin branch results in non-fast-forward error

I am trying on working on my featureA branch while keeping it up-to-date with the master branch. Here is the …

git branch rebase fast-forward