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

DOC: Updated doc of nonzero() #8850

Merged
merged 2 commits into from
Mar 30, 2017
Merged

DOC: Updated doc of nonzero() #8850

merged 2 commits into from
Mar 30, 2017

Conversation

jsh9
Copy link
Contributor

@jsh9 jsh9 commented Mar 27, 2017

Updated documentation of nonzero() to eliminate ambiguity

Updated documentation of nonzero() to eliminate ambiguity
@eric-wieser
Copy link
Member

eric-wieser commented Mar 27, 2017

Commit message should start with DOC: . But looks good to me otherwise

@jsh9 jsh9 changed the title Updated doc of nonzero() DOC: Updated doc of nonzero() Mar 27, 2017
@jsh9
Copy link
Contributor Author

jsh9 commented Mar 27, 2017

I fixed the title of this commit. It now starts with "DOC:"

@charris
Copy link
Member

charris commented Mar 27, 2017

You need to change the commit message heading. That will require git rebase -i HEAD^ followed by a force push. If you need help with that, squawk.

@jsh9
Copy link
Contributor Author

jsh9 commented Mar 27, 2017

Yes, I need some help. I am now making changes on the web page end. (And I am still learning how to use git on terminal.)

DOC: Updated documentation of nonzero() to eliminate ambiguity
@jsh9
Copy link
Contributor Author

jsh9 commented Mar 27, 2017

So I submitted another commit (just in order to add "DOC:" to the commit message heading). I only added two spaces in this commit.

@eric-wieser
Copy link
Member

eric-wieser commented Mar 27, 2017

You should rebase --squash those two commits together.

What you should have done before you made that second one is git commit --amend, which would edit the old commit.

Once you've done that, you can git push -f

@eric-wieser
Copy link
Member

I am now making changes on the web page end.

Ah, unfortunately that doesn't allow you to amend the commit. You'll either need to use the terminal, or wait for me or someone else to squash it for you

@eric-wieser eric-wieser merged commit 77c875f into numpy:master Mar 30, 2017
array([[1, 0, 0],
[0, 2, 0],
[1, 1, 0]])
>>> (array([0, 1, 2, 2], dtype=int64), array([0, 1, 0, 1], dtype=int64))
Copy link
Member

Choose a reason for hiding this comment

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

Where did >>> np.nonzero(x) go?

eric-wieser added a commit to eric-wieser/numpy that referenced this pull request Mar 30, 2017
Apologies for the bad merge here

[ci skip]
juliantaylor added a commit that referenced this pull request Mar 30, 2017
DOC: Replace line that was errantly removed in #8850
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants