Menu
I am working on a branch called foo and I want to rebase my branch against origin/foo. In modern versions of git I could run
$ git pull --rebase origin foo
That's a lot of typing for a common operation. Additionally, because I have an old version of git (see this), I also need to run a fetch first so that my local graph doesn't seem confusing:
$ git fetch && git pull --rebase origin foo
How can I write that as a git alias?
997
Pull into Current Using Rebase (for remote branches) to fetch changes from the selected branch and rebase the current branch on top of these changes. Checkout and Rebase onto Current (for both remote and local branches) to check out the selected branch and rebase it on top of the branch that is currently checked out.
To rebase, make sure you have all the commits you want in the rebase in your master branch. Check out the branch you want to rebase and type git rebase master (where master is the branch you want to rebase on).
The Rebase Option This moves the entire feature branch to begin on the tip of the main branch, effectively incorporating all of the new commits in main . But, instead of using a merge commit, rebasing re-writes the project history by creating brand new commits for each commit in the original branch.
The command
git symbolic-ref --short HEAD
outputs the short name of the current branch, if any (or HEAD, if the HEAD is detached). Therefore, you can use it inside a command substitution in your alias definition:
git config --global alias.<name> '!git fetch && git pull --rebase origin $(git symbolic-ref --short HEAD)'
where <name> stands for your alias's name.
54
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
