Pass an argument to a Git alias command

Can I pass arguments to the alias of a Git command?

I have some alias in Git config, like so:

rb1 = rebase -i HEAD~1
rb2 = rebase -i HEAD~2
rb3 = rebase -i HEAD~3
rb4 = rebase -i HEAD~4
....

Is it possible to make an rb alias so that git rb <x> works for any <x>?

I tried this alias:

rb = rebase -i HEAD~

but then for instance git rb 8 does not work.

24986 次浏览
小开
最佳答案

If you consider the Git Faq section "Git Aliases with argument", you could do it, but by calling git through a shell:

[alias]
rb = "!sh -c \"git rebase -i HEAD~$1\" -"

I haven't tested it yet, but if you can pass an argument, that would be the way to do it.

A similar solution would be to use a shell function:

[alias]
rb = "!f() { git rebase -i HEAD~$1; }; f"
小开

Rebasing all commits since branching

If you just want to rebase all the commits that are new in your branch, since the time you branched from the parent branch, it would be easier to just have the following alias in your config:

rbi = !sh -c \"git rebase -i `git merge-base $1 HEAD`\" -

Then, if you wanted to rebase all the commits you've added to your current branch, you could simply run:

git rbi parentBranch

This approach uses an argument, but instead of having to know how many commits to go back, you just supply the branch name, and it figures out most recent commit shared between the current branch and the parent branch via git merge-base

Why this, rather than git rebase -i parentBranch

The reason you would do this rather than a straight git rebase -i parentBranch is that you might not want to deal with the merge-conflicts until a later point, or even deal with a merge-conflict in one commit, and then the same conflict on the same line in another commit. See https://stackoverflow.com/a/31036645/444610

小开

I wrote this function "grb" to do Git interactive rebase on a Mac, so I can say grb 5 to show my last 5 commits:

function grb {
git rebase -i HEAD~$1
}

The top answer on this page does not work for me. To see my .zprofile and all other Git aliases I use on my Mac:

https://github.com/rayning0/zsh_profile/blob/master/.zprofile#L157

小开

@Droogans pointed out in a comment on the accepted answer that, at least on macOS (I would imagine the same will hold true for any unix-like OS, and maybe even windows), you can just use $1 as the placeholder value representing the argument in the alias. So, to set up an alias so that git rb 8 becomes git rebase -i HEAD~8:

    rb = "!git rebase -i HEAD~$1;"

You can also use it multiple times in an alias, so if, for example, you wanted an alias that would translate git f my-branch to git fetch origin my-branch:my-branch, you can do:

    f = "!git fetch origin $1:$1"

提交答案