Can I make fast forwarding be off by default in git?

by

It seems there is still a pending question in the thread: How to do it globally (i.e. for all branches) ? For the records, we can use the following:

git config --add merge.ff false

…to make it apply to all branches in the current repository. To make it apply to all branches in all repositories where someone has not run it without the --global option (local settings override global) run this:

git config --global --add merge.ff false

From the documentation:

merge.ff
By default, git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. When set to false, this variable tells git to create an extra merge commit in such a case (equivalent to giving the --no-ff option from the command line). When set to only, only such fast-forward merges are allowed (equivalent to giving the --ff-only option from the command line).

More Related Contents:

  1. What is the difference between merge –squash and rebase?
  2. What effect does the `–no-ff` flag have for `git merge`?
  3. What’s the difference between ‘git merge’ and ‘git rebase’?
  4. Git – how to force merge conflict and manual merge on selected file
  5. Rebasing a branch including all its children
  6. git cherry-pick says “…38c74d is a merge but no -m option was given”
  7. Rebasing a Git merge commit
  8. Prevent commits in master branch
  9. Pull a certain branch from the remote server
  10. git rebase and git push: non-fast forward, why use?
  11. git merge: Removing files I want to keep!
  12. How do I use `git rebase -i` after `git merge` without messing things up?
  13. Git: Merge to master while automatically choosing to overwrite master files with branch
  14. Git commits are duplicated in the same branch after doing a rebase
  15. How to merge two branches without a common ancestor?
  16. How to rebase one Git repository onto another one?
  17. What to do with branch after merge
  18. Git rebase branch with all parent branches (or dependent sub-branches)
  19. Undoing a git rebase
  20. How do you create a remote Git branch?
  21. What is a tracking branch?
  22. How do I recover/resynchronise after someone pushes a rebase or a reset to a published branch?
  23. How do I merge changes to a single file, rather than merging commits?
  24. Merge changes from remote github repository to your local repository
  25. Change old commit message using `git rebase`
  26. Tell git not to merge binary files but to choose
  27. Different default remote (tracking branch) for git pull and git push
  28. Block a git branch from being pushed
  29. How do I make git merge’s default be –no-ff –no-commit?
  30. How can I prevent non-fastforward pushes to selected branch(es) in git?

Leave a Comment