From 8c9e9b0cd5b24dfbf1424d1f253d02de80e8f5ef Mon Sep 17 00:00:00 2001 From: Greg Price Date: Tue, 27 Aug 2019 11:16:31 -0700 Subject: [PATCH] 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 --- .gitignore | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5f1ba0b92ce..9f3b1ac83b5 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