Add more aliases for git merge
and git rebase
#2223
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds Git aliases for merging are rebasing, which are needed when conflicts occur.
Description
For a better user experience, the same pattern for constructing the aliases is applied for merge and rebase. The aliases also largely match the ones provided by OMZ.
gms
is inspired by OMZ (I have never used it, personally).Motivation and Context
When working with branches conflicts can occur and need to be resolved. This may involve options like
--continue
and--abort
for merge and rebase. Some developers may even want to perform--interactive
rebasing.How Has This Been Tested?
I have the identical changes integrated in a fresh, local installation of Bash-it on my developer laptop.
To verify that the aliases don't conflict with existing ones, I have grepped the current repository HEAD for "gma", "gmc", "gms", "grba", "grbc" and "grbi".
Types of changes
Checklist:
clean_files.txt
and formatted it usinglint_clean_files.sh
.