← Back to context

Comment by mcny

5 hours ago

I write really poopy commit messages. Think "WIP" type nonsense. I branch off of the trunk, even my branch name is poopy like

feature/{first initial} {last initial} DONOTMERGE {yyyy-MM-dd-hh-mm-ss}

Yes, the branch name literally says do not merge.

I commit anything and everything. Build fails? I still commit. If there is a stopping point and I feel like I might want to come back to this point, I commit.

I am violently against any pre commit hook that runs on all branches. What I do on my machine on my personal branch is none of your business.

I create new branches early and often. I take upstream changes as they land on the trunk.

Anyway, this long winded tale was to explain why I rebase. My commits aren't worth anything more than stopping points.

At the end, I create a nice branch name and there is usually only one commit before code review.

5 comments

mcny

Reply
rkomorn  5 hours ago

Isn't your tale more about squashing than rebasing?

  • OJFord  4 hours 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  4 hours ago

      I guess my point is that I disagree that rebasing should be shorthand for all these things that aren't rebasing.