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

docs/tutorial.md: introduce both long and short names of each option #2415

Merged
merged 2 commits into from
Oct 23, 2023

Conversation

gasche
Copy link
Contributor

@gasche gasche commented Oct 23, 2023

This is an alternative to #2409 , as discussed in #2409 (comment) .

I found the rebase part of the tutorial confusing due to the use of machine-dependent change IDs on an unknown command. #2409 fixes this by referring to changes by their description, but this is un-idiomatic and does not scale to real repositories. The present PR instead explains the rebase options before using them, with the clearer long names. All other options in the tutorial are changed to this style for consistency.

Copy link
Member

@martinvonz martinvonz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me, thanks. Feel free to merge if you prefer this over #2409 (I think I do). The commit from #2409 dropping the mention of heads() still makes sense. Feel free to move/copy that into this PR before merging, or leaving only that commit in the other PR, or open a new PR just for that.

Instead we point explicitly at the full documentation on revsets.

Suggested-by: Martin von Zweigbergk <[email protected]>
@gasche
Copy link
Contributor Author

gasche commented Oct 23, 2023

Thanks! I removed the mention of heads(x) and also ported (from the other PR) the addition of an explicit pointer to the documentation on revsets. (I noticed when reading the source that the pointer is already included in the text itself, but in a very lightweight way that I missed as a first-time reader of the tutorial.)

@gasche gasche enabled auto-merge (rebase) October 23, 2023 09:51
@gasche gasche merged commit b0048bc into jj-vcs:main Oct 23, 2023
14 checks passed
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

Successfully merging this pull request may close these issues.

2 participants