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

git-imerge: add page #934

Merged
merged 3 commits into from
Jun 28, 2016
Merged

git-imerge: add page #934

merged 3 commits into from
Jun 28, 2016

Conversation

waldyrious
Copy link
Member


- Start imerge-based rebase (checkout the branch to be rebased, first):

`git imerge rebase {{branch_to_rebase_into}}`
Copy link

Choose a reason for hiding this comment

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

I suggest changing the argument name to branch_to_rebase_onto, since your branch will end up on top of the other branch; the other branch is not changed.

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure! as a non-native English speaker, these nuances sometimes elude me :) thanks for the review!

@mhagger
Copy link

mhagger commented Jun 28, 2016

I didn't know about this tldr thing, but it seems useful.

I think you've captured the most important git imerge commands with good explanations.

Do tldr pages typically mention where commands can be installed from, or include cross-references to the main documentation? git imerge is not part of standard Git, so I would expect that to be a frequent question.

But anyway, 👍 thanks for this ✨

@waldyrious
Copy link
Member Author

waldyrious commented Jun 28, 2016

Do tldr pages typically mention where commands can be installed from, or include cross-references to the main documentation? git imerge is not part of standard Git, so I would expect that to be a frequent question.

Yeah, I thought about that too, but it hasn't been the case so far. I suppose the expectation is that when someone tldr's a command, it's because they already know about it, which seems fair. Still, a future "references", "links" or "notes" section is certainly something we should consider. C.f. #785

@waldyrious
Copy link
Member Author

Given the blessing of the tool's author himself, I'll self-merge :)

@waldyrious waldyrious merged commit 384557e into master Jun 28, 2016
@waldyrious waldyrious deleted the git-imerge branch June 28, 2016 10:57
@leostera
Copy link
Contributor

👍

@waldyrious waldyrious added the new command Issues requesting creation of a new page. label Aug 31, 2016
@waldyrious waldyrious changed the title Create git-imerge.md git-imerge: add page Sep 21, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
new command Issues requesting creation of a new page.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants