Git merge squash repeatedly

by

Starting with

      X stable
     /                   
a---b---c---d---e---f---g development

You can use the following steps to copy the last commit from your development branch to your stable branch:

git checkout development@{0}  # get working tree from "development", detach HEAD
git reset --soft stable  # reposition detached HEAD on "stable"
git commit  # enter the appropriate commit message
git branch temp  # create a temporary branch "temp" at HEAD
git checkout temp  # get on the new temporary branch
git branch -M stable  # rename "temp" to "stable"

so you end up with:

      X-------------------G stable
     /                   
a---b---c---d---e---f---g development

If you continue work on “development”, e.g.,

      X-------------------G stable
     /                   
a---b---c---d---e---f---g---h---i---j development

you can repeat the same git commands as above and you will end up with:

      X-------------------G-----------J stable
     /                   
a---b---c---d---e---f---g---h---i---j development

More Related Contents:

  1. Git cherry pick and datamodel integrity
  2. Updates were rejected because the remote contains work that you do not have locally
  3. What’s the best visual merge tool for Git? [closed]
  4. Trying To Understand/Determine A Basic Git Workflow
  5. Error “Updates were rejected because the remote contains work that you do not have locally”
  6. How to perform a three-way diff in Git without merging?
  7. Ignore files that have already been committed to a Git repository [duplicate]
  8. How to list branches that contain a given commit?
  9. Which commit has this blob?
  10. How can I make git accept a self signed certificate?
  11. What is a tracking branch?
  12. What’s the difference between ‘git merge’ and ‘git rebase’?
  13. I ran into a merge conflict. How do I abort the merge?
  14. What are .git/info/grafts for?
  15. git – skipping specific commits when merging
  16. How do I get my ‘Detached HEAD’ commits back into master [duplicate]
  17. Get changes from master into branch in Git
  18. git merge: Removing files I want to keep!
  19. Making Git retain different section content between branches
  20. How to “git show” the diffs for a merge commit?
  21. git-svn: what’s the equivalent to `svn switch –relocate`?
  22. How do I reset or revert a file to a specific revision?
  23. Is there a migration tool from CVS to Git?
  24. What to do with branch after merge
  25. Differences between git pull origin master & git pull origin/master
  26. Ignoring an already checked-in directory’s contents?
  27. Git Ignores and Maven targets
  28. Git: Merge a Commit into a different Branch
  29. Diffing between two entire directories/projects in hg or git?
  30. Where does a Git branch start and what is its length?

Leave a Comment