Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

"upstream HEAD" or "either of these branches" revision specifier #1037

Open
shish opened this issue Mar 4, 2025 · 0 comments
Open

"upstream HEAD" or "either of these branches" revision specifier #1037

shish opened this issue Mar 4, 2025 · 0 comments

Comments

@shish
Copy link
Contributor

shish commented Mar 4, 2025

I fairly regularly want to rebase my in-development work on top of upstream

In some repositories, I do this with sl rebase -s 'draft()' -d master, in other repositories, I do this with sl rebase -s 'draft()' -d main. I switch between several projects with different conventions, so there's a good chance that whichever one I have in my shell history / muscle memory is the wrong one.

Is there some way I could more generically specify "rebase draft commits on top of upstream HEAD"? Or maybe "rebase on top of (main or master, whichever one exists; or use the first one if both exist)"

(I've looked though the revset docs and couldn't find anything, but maybe I just missed it?)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant