Databases
StackOverflow2013
Postsdbo
POgit rebase interactive: squash merge commits together
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POgit rebase interactive: squash merge commits together
    primarykey
    data
    text
    <p>I wanted to have a simple solution to squash two merge commits together during an interactive rebase.</p> <p>My repository looks like:</p> <pre><code> X --- Y --------- M1 -------- M2 (my-feature) / / / / / / a --- b --- c --- d --- e --- f (stable) </code></pre> <p>That is, I have a <code>my-feature</code> branch that has been merged twice recently, with no real commits in between. I don't just want to rebase the <code>my-feature</code> branch since it is a published branch of its own, I just want to squash together the last two merge commits into one (haven't published those commits yet)</p> <pre><code> X --- Y ---- M (my-feature) / / / / a --- ... -- f (stable) </code></pre> <p>I tried:</p> <pre><code>git rebase -p -i M1^ </code></pre> <p>But I got:</p> <pre><code>Refusing to squash a merge: M2 </code></pre> <p>What I finally did is:</p> <pre><code>git checkout my-feature git reset --soft HEAD^ # remove the last commit (M2) but keep the changes in the index git commit -m toto # redo the commit M2, this time it is not a merge commit git rebase -p -i M1^ # do the rebase and squash the last commit git diff M2 HEAD # test the commits are the same </code></pre> <p>Now, the new merge commit is not considered a merge commit anymore (it only kept the first parent). So:</p> <pre><code>git reset --soft HEAD^ # get ready to modify the commit git stash # put away the index git merge -s ours --no-commit stable # regenerate merge information (the second parent) git stash apply # get the index back with the real merge in it git commit -a # commit your merge git diff M2 HEAD # test that you have the same commit again </code></pre> <p>But this can get complicated if I have many commits, do you have a better solution ? Thanks.</p> <p>Mildred</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. USOrangeDog
    1. USMildred
    plurals
    1. This table or related slice is empty.
    1. PL
      singulars
      1. LTLinked
    2. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    3. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POgit rebase interactive: squash merge commits together
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POgit rebase interactive: squash merge commits together
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POgit rebase interactive: squash merge commits together
      1. USJames Cassell
      1. VTFavorite
    1. COWell, when you do your second merge, you can always use `--squash` to avoid creating a commit, and then use `git commit --amend` to modify the previous merge.
      singulars
      1. POgit rebase interactive: squash merge commits together
      1. USMildred
    2. COThis won't work, it won't save the new version of the branch you merged from in the commit
      singulars
      1. POgit rebase interactive: squash merge commits together
      1. USMildred
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload