diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-08-27 11:35:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-27 11:35:11 -0700 |
| commit | caf7a30efecef21def997ab214dc6c1604d90a84 (patch) | |
| tree | 20a2a8af87e7d5798b13ac17fa702ee8b40a7536 /.gitignore | |
| parent | d5ba8bbdae9a59c10c1275f71415732d68fe9661 (diff) | |
| download | cpython-git-caf7a30efecef21def997ab214dc6c1604d90a84.tar.gz | |
bpo-37936: Remove some .gitignore rules that were intended locally. (GH-15542)
These appeared in commit c5ae169e1. The comment on them, as well as
the presence among them of a rule for the .gitignore file itself,
indicate that the author intended these lines to remain only in their
own local working tree -- not to get committed even to their own repo,
let alone merged upstream.
They did nevertheless get committed, because it turns out that Git
takes no notice of what .gitignore says about files that it's already
tracking... for example, this .gitignore file itself.
Give effect to these lines' original intention, by deleting them. :-)
Git tip, for reference: the `.git/info/exclude` file is a handy way
to do exactly what these lines were originally intended to do. A
related handy file is `~/.config/git/ignore`. See gitignore(5),
aka `git help ignore`, for details.
https://bugs.python.org/issue37936
Automerge-Triggered-By: @zware
(cherry picked from commit 8c9e9b0cd5b24dfbf1424d1f253d02de80e8f5ef)
Co-authored-by: Greg Price <gnprice@gmail.com>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index 9445ef1e2c..9c0c2ef07a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,8 @@ -# added for local development -.buildaix/ -Modules/python.exp -buildaix/ -installp/ -.gitignore - # Two-trick pony for OSX and other case insensitive file systems: # Ignore ./python binary on Unix but still look into ./Python/ directory. /python !/Python/ + *.cover *.iml *.o |