Git merge without auto commit

by

Note the output while doing the merge – it is saying Fast Forward

In such situations, you want to do:

git merge <name-of-branch> --no-commit --no-ff

Important: If you do it this way, then you are not able to do any changes to the files in the staging area e.g. you can’t remove/add files or make any changes to the files.

If you want to merge the changes and then commit as if you had manually typed all of the changes you merged in (as opposed to a traditional merge) you need to run rm .git/MERGE_HEAD afterward, which will force git to forget that the merge happened.

More Related Contents:

  1. New to GitHub, how to run the commands on Windows?
  2. Definition of “downstream” and “upstream”
  3. How to find the nearest parent of a Git branch
  4. How do I view ‘git diff’ output with my preferred diff tool/ viewer?
  5. Re-doing a reverted merge in Git
  6. How to find/identify large commits in git history?
  7. How to squash all git commits into one?
  8. Git 1.6.4 beta on Windows (msysgit) – Unix or DOS line termination
  9. Git: Could not resolve host github.com error while cloning remote repository in git
  10. Combining multiple commits before pushing in Git [duplicate]
  11. Git: ignore some files during a merge (keep some files restricted to one branch)
  12. git push to multiple repositories simultaneously [duplicate]
  13. How do I revert a merge commit that has already been pushed to remote?
  14. How do I remove local (untracked) files from the current Git working tree?
  15. Why does Git tell me “Not currently on any branch” after I run “git checkout origin/”?
  16. How do I make git block commits if user email isn’t set?
  17. Difference between git stash pop and git stash apply
  18. Merging between forks in GitHub
  19. Gerrit error when Change-Id in commit messages are missing
  20. git remote add with other SSH port
  21. git status shows fatal: bad object HEAD
  22. What are the consequences of using receive.denyCurrentBranch in Git?
  23. Unignore subdirectories of ignored directories in Git
  24. how to log out of one Github account and use another account?
  25. How to resolve merge conflict in pull request in VSTS?
  26. Pushing a large github repo fails with “unable to push to unqualified destination: master”
  27. How to derive application build version string with Git’s `describe` command?
  28. The following untracked working tree files would be overwritten by merge, but I don’t care
  29. Bower install using only https?
  30. Git hangs while writing objects

Leave a Comment