Reference all commits between master branch-tip and HEAD in git

Question

I currently am branched out of master (call it branchA). I have made a couple of commits to branchA and would now like to squash commits together on my branch prior to merging to master. Usually I do something like this in my branchA repo:

git rebase -i HEAD~n

I would get n by doing a git log and manually counting the commits from (not including) the master branch tip until (and including) the branch's HEAD . For now the count has been easy as the commits are few.

Is there a simple way to reference all commits on current branch after master branch-tip commit?

Answer 1

You could try:

git rebase -i $( git merge-base master HEAD )

You are fiding the point where master and your current branch diverged (or at least, one of the latest common ancestors) and using it as the parameter for rebase. That might work.

If what you want to know is how many revisions there are on your branch:

git log --pretty=%h $( git merge-base master HEAD ) | wc -l

As a side note, you could just as easily squash without doing rebase:

git reset --soft $( git merge-base master HEAD )
git commit -m "Squashed feature"

IMHO warning: I don't see why people would rather go to an editor, edit God knows how many lines when a couple of commands would do the trick. But.... anyway.

Answer 2

Is there a simple way to reference all commits on current branch after master branch-tip commit?

Yes, just do this:

git rebase -i master