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

Support git blame ignore revs #12091

Merged
merged 3 commits into from Jan 31, 2020
Merged

Conversation

terrdavis
Copy link
Contributor

@terrdavis terrdavis commented Jan 21, 2020

In response to this comment.

Please note:

  • neither Github nor GitLab supports this feature.
  • the IntelliJ plugin GitToolBox supports this feature, so perhaps other client-side git tools do too?

terrdavis added 2 commits Jan 21, 2020
Windows and non-Windows scripts are provided for initial setup.
Commit hashes to ignore are entered in the file .git-blame-ignore-revs
@Carreau Carreau added this to the 7.12 milestone Jan 31, 2020
@Carreau
Copy link
Member

@Carreau Carreau commented Jan 31, 2020

Thanks ! That is great.

Even if it's not (yet) supported by github/gitlab, when we do such commits we can link to this documentation explicitly, and see if some clarifications are needed.

I'll need to fix MANIFEST.in to exclude .git-blame-ignore-revs or test are failling; i'll try to do that later unless you beat me to it.

.git-blame-ignore-revs is added so that  we can ignore revisions in .git-blame,  mostly code reformatting; but CI check that all files are explicitly included (or excluded) from manifest; so we need to list this one explicitly for travis to succeed.
@Carreau Carreau merged commit 06fc595 into ipython:master Jan 31, 2020
2 checks passed
@Carreau
Copy link
Member

@Carreau Carreau commented Jan 31, 2020

Thanks !

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

2 participants