Correct Git commits with git-autofixup

Re:Correct Git commits with git-autofixup by StavrosK on Thursday March 18, 2021 @08:52PM (#26509194)

Is there one of these `@{}` tags that means "the point where this branch split off from master"? That'd be very useful, because that's usually the scope of my rebases.

[ Parent | on HN ]

Re:Correct Git commits with git-autofixup by chrismorgan on Friday March 19, 2021 @06:58AM (#26511924)

I recommend reading the git-rev-parse(1) man page in full, it’ll give you good ideas for this sort of thing.

What you’re looking for could be spelled $(git merge-base HEAD master) (that’s a subshell invocation, outputting a single commit ID). In some circumstances dotted range notation might do: master.. includes all the commits after master and HEAD diverge. That’s good for logging, for example, but not so useful for the sort of rebasing you’re describing, where you may wish to use the merge base instead.

[ Parent | on HN ]

Re:Correct Git commits with git-autofixup by StavrosK on Friday March 19, 2021 @10:57PM (#26520447)

That's helpful, thanks! I already do use merge-base, I was wondering if there's a builtin shortcut as I hadn't seen anything in the rev-parse manage.

[ Parent | on HN ]