Removed rustdoc comments on pub mod statements in std::io's mod.rs. Twea...

[zslayton]

Attn: @huonw

Addresses #12386.

[alexcrichton]

Can you move this comment inside the module?

[alexcrichton]

I'd also be find with deleting these doc-comments instead of just making them comments.

[zslayton]

@alexcrichton Done!

[alexcrichton]

This appears to have picked up a few extra commits. I would recommend using git rebase instead of git merge to get a clean history.

[zslayton]

Shoot. It would seem that I'm not very talented at rebasing. I was trying to do that when I somehow created the merge commits.

I have a master branch and this bugfix branch, 'doc-fix-12386'. Mozilla's repo is my upstream.

Whenever I run git rebase upstream/master from my doc fix branch, I get a bunch of conflicts listed for files that I didn't touch. (i.e. files outside of src/libstd/io). I'm afraid that I'm not sure how to resolve them -- can I just rebase with -Xtheirs? Or is that dangerous?

[alexcrichton]

It may have been the case that you just needed to start a new branch and cherry-pick your one commit on top, but I'm not entirely sure. Regardless, it seems to have been sorted out!

Sorry I forgot to mention this earlier, but could you also mention the issue in the commit message itself? If you phrase it like Closes #XXXX github will auto-close the issue when this PR is merged.

[zslayton]

Sure, I'd be happy to. It's not possible to change the commit message once it's been pushed, is it? How do you recommend I amend it?

[zslayton]

Nevermind, I just reset the branch and reapplied my changes with the new message.

[alexcrichton]

You can also use git commit --amend plus a force-push to change a commit message.

[zslayton]

Oh! Educational. Thanks!

On Sun, Feb 23, 2014 at 11:47 PM, Alex Crichton notifications@github.comwrote:

You can also use git commit --amend plus a force-push to change a commit
message.

Reply to this email directly or view it on GitHubhttps://github.com//pull/12490#issuecomment-35857620
.