Created
July 10, 2019 17:59
-
-
Save drewdaemon/026d99f672e0b45d75f0b001978783f4 to your computer and use it in GitHub Desktop.
Helpful aliases for merging/rebasing off master
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [alias] | |
| pmerge = "!f() { git fetch origin \"$1\":\"$1\" && git merge \"$1\"; }; f" | |
| pbase = "!f() { git fetch origin \"$1\":\"$1\" && git rebase \"$1\"; }; f" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Use
git pmerge <branch-name>to pull the branch and merge it into the current branch.Use
git pbase <branch-name>to pull the branch and rebase against it.