How do I make git merge’s default be –no-ff –no-commit?

by

Put this in $HOME/.gitconfig:

[merge]
    ff = no
    commit = no

You can use git-config to do this:

  git config --global merge.commit no
  git config --global merge.ff no

More Related Contents:

  1. How to replace master branch in Git, entirely, from another branch? [duplicate]
  2. How do you merge two Git repositories?
  3. How to merge a specific commit in Git
  4. Git cherry pick and datamodel integrity
  5. How can I prevent foxtrot merges in my ‘master’ branch?
  6. Updates were rejected because the remote contains work that you do not have locally
  7. Is it possible for git-merge to ignore line-ending differences?
  8. Merging: Hg/Git vs. SVN
  9. What is the precise meaning of “ours” and “theirs” in git?
  10. git cherry-pick says “…38c74d is a merge but no -m option was given”
  11. Git – Ignore files during merge
  12. `git merge -s theirs` needed but it does not exist
  13. Git Cherry-pick vs Merge Workflow
  14. Trying To Understand/Determine A Basic Git Workflow
  15. Pull a certain branch from the remote server
  16. git rebase and git push: non-fast forward, why use?
  17. Disable Git Rename Detection
  18. git partial merge, not whole branch
  19. Simple tool to ‘accept theirs’ or ‘accept mine’ on a whole file using git
  20. How can I get the parents of a merge commit in Git?
  21. How to merge two branches without a common ancestor?
  22. How would I write a pre-merge hook in Git?
  23. Are there any downsides to enabling git rerere?
  24. Reverting a git merge while allowing for the same merge later)
  25. git: merge two branches: what direction?
  26. Git: How to create patches for a merge?
  27. git: How do I add a custom merge strategy?
  28. Git merge squash repeatedly
  29. git merging branches in a bare repository
  30. The following untracked working tree files would be overwritten by merge, but I don’t care

Leave a Comment