Created
July 24, 2023 18:44
-
-
Save jonchurch/a64b7ed735d2e2e4d5e166c5e0a7e182 to your computer and use it in GitHub Desktop.
git aliases
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] | |
| root = rev-parse --show-toplevel | |
| pr = "!f() { git fetch -fu ${2:-upstream} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f" | |
| conflicts = diff --name-only --diff-filter=U | |
| fix = "!f() { ${EDITOR} `git conflicts`; }; f" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment