4 ms·

But it's also solved by merging, which is why I don't see the point of rebasing. What's the advantage?

• cryptonector 7y ago
  Linear history.
  • StavrosK 7y ago
    How is that an advantage?
    • cryptonector 7y ago
      It's much easier to understand linear upstream history! Also, with this script you get to see which of your commits is conflicting with which upstream commits. That's really important information to me.
      • StavrosK 7y ago
        I'll give it a shot next time I have conflicts, thanks.
        • cryptonector 7y ago
          You're welcome. Leave a comment on the gist about how it goes, if you remember! I'd really like git to have this feature built-in to it...