4 ms·

I’m curious how this workflow differs from `git merge --squash`.

• ajkjk 3y ago
  I dunno, I've literally never used merge ever since realizing what it does to the commit history.
  • ksenzee 3y ago
    Then you should probably look up squash “merges,” because I believe that’s your `git rebase --tip`. I use quotation marks because it’s not an actual merge. It just takes all the changes from the feature branch and stages them in the index, ready for you to commit as one single non-merge commit.