Git alias for rebase to common ancestor

Question

I am trying to make a git alias to rebase onto the common ancestor of another branch. So that I can type...

git rbca develop -i

and it gets expanded to...

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

Here is what I have:

rbca = "!git rebase $(git merge-base HEAD $1) #"

I'm very close. They only problem is that the # doesn't work as expected so the -i has no effect.

Here are the other SO answers that have gotten me this far.

The second question you linked to says "The final # is important - it prevents all the user-supplied arguments from being processed by the shell (it comments them out)". So.. it sounds like you want to leave off the final #? — omajid
– omajid, Commented Oct 26, 2018 at 20:06
@omajid That doesn't work. It seems like the develop argument is double counted. — cambunctious
– cambunctious, Commented Oct 26, 2018 at 20:19

cambunctious · Accepted Answer · 2018-10-26 20:22:07Z

I got it. I need to add arguments 2 and after using ${@:2} and still use # to prevent arguments from being added again.

rbca = "!git rebase $(git merge-base HEAD \"$1\") ${@:2} #"

1 Answer 1