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

Added -q option to %prun for suppression of the output, along with editing the dochelp string #1217

Merged
merged 0 commits into from Jan 1, 2012
Merged

Added -q option to %prun for suppression of the output, along with editing the dochelp string #1217

merged 0 commits into from Jan 1, 2012

Conversation

andrewgiessel
Copy link
Contributor

A new pull request, with only the -q option, as discussed.

@minrk
Copy link
Member

minrk commented Jan 1, 2012

As with the previous PR, can you avoid having big whitespace 'cleanup' of the rest of the file in your commits? It's possible your editor is doing this automatically, which I don't recommend.

@andrewgiessel
Copy link
Contributor Author

Sorry about this-

I don't understand exactly what is happening- I inserted a single line,
which I guess shifts several lines down throughout the file? It doesn't
really make sense that this should add/remove whitespace throughout the the
file? FWIW I'm using emacs on os x and installed git w/i the last month.
I am calling 'delete-trailing-whitespace' before saving (automatically).
Perhaps this is the cause?

On Sat, Dec 31, 2011 at 20:52, Min RK <
reply@reply.github.com

wrote:

As with the previous PR, can you avoid having big whitespace 'cleanup' of
the rest of the file in your commits? It's possible your editor is doing
this automatically, which I don't recommend.


Reply to this email directly or view it on GitHub:
#1217 (comment)

Andrew Giessel, PhD

Department of Neurobiology, Harvard Medical School
220 Longwood Ave Boston, MA 02115
ph: 617.432.7971 email: andrew_giessel@hms.harvard.edu

@minrk
Copy link
Member

minrk commented Jan 1, 2012

Sorry about this-

I don't understand exactly what is happening- I inserted a single line,
which I guess shifts several lines down throughout the file? It doesn't
really make sense that this should add/remove whitespace throughout the the
file? FWIW I'm using emacs on os x and installed git w/i the last month.
I am calling 'delete-trailing-whitespace' before saving (automatically).
Perhaps this is the cause?

No problem. Yes, this is the cause. I don't recommend this setting, but if you do keep it, I believe you can instruct git to ignore white space changes in your .gitconfig.

On Sat, Dec 31, 2011 at 20:52, Min RK <
reply@reply.github.com

wrote:

As with the previous PR, can you avoid having big whitespace 'cleanup' of
the rest of the file in your commits? It's possible your editor is doing
this automatically, which I don't recommend.


Reply to this email directly or view it on GitHub:
#1217 (comment)

Andrew Giessel, PhD

Department of Neurobiology, Harvard Medical School
220 Longwood Ave Boston, MA 02115
ph: 617.432.7971 email: andrew_giessel@hms.harvard.edu


Reply to this email directly or view it on GitHub:
#1217 (comment)

@takluyver
Copy link
Member

Other than the whitespace thing, this looks fine.

@andrewgiessel andrewgiessel merged commit 010073c into ipython:master Jan 1, 2012
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.

None yet

3 participants