4 ms·

Isn't your tale more about squashing than rebasing?

• bawolff 10mo ago
  Personally i squash using git rebase -i
• OJFord 10mo ago
  Any subsequent commits and the branch are inherently rebased on the squashed commit. Rebasing is kind of a short hand for cherry-picking, fixing up, rewording, squashing, dropping, etc. because these things don't make sense in isolation.
  • rkomorn 10mo ago
    I guess my point is that I disagree that rebasing should be shorthand for all these things that aren't rebasing.
    • OJFord 10mo ago
      Well rebasing is exactly equivalent to moving the branch and then cherry-picking, and the others are among the commands available in rebase --interactive.
• deleted 10mo ago
  [deleted]