support calling stg rebase without arguments #507
Merged
Conversation
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
fbenkstein
force-pushed
the
rebase-without-arguments
branch
from
b7fc2e2 to
998b93d
Compare
fbenkstein
force-pushed
the
rebase-without-arguments
branch
from
998b93d to
c090d24
Compare
|
Sorry for the churn, I was still figuring out the testing. |
Signed-off-by: Frank Benkstein <[email protected]>
fbenkstein
force-pushed
the
rebase-without-arguments
branch
2 times, most recently
from
8241322 to
a245639
Compare
When calling "git rebase" without a target commit argument then it will try to look up remote tracking branch and rebase onto that. This change makes "stg rebase" behave the same way. This slightly changes the behavior of `stg rebase --interactive`: previously when called without argument it would rebase onto the stack base, now it will rebase onto the upstream branch. Signed-off-by: Frank Benkstein <[email protected]>
fbenkstein
force-pushed
the
rebase-without-arguments
branch
from
a245639 to
9e747c2
Compare
|
Thanks for this PR. This seems like a sensible change. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When calling "git rebase" without a target commit argument then it will try to look up remote tracking branch and rebase onto that. This change makes "stg rebase" behave the same way. Note that this introduces a slight discrepancy with "stg rebase --interactive": in this case it will still use the stack base instead of the remote tracking branch.