Merge remote-tracking branch 'origin/2.0' into 2.0

weaverryan · weaverryan · commit 75f42379debb · 2012-07-04T17:14:48.000-05:00
diff --git a/contributing/code/patches.rst b/contributing/code/patches.rst
@@ -32,6 +32,13 @@ Set up your user information with your real name and a working email address:
     If you are new to Git, we highly recommend you to read the excellent and
     free `ProGit`_ book.
 
+.. tip::
+
+    If your IDE creates configuration files inside project's directory,
+    you can use global ``.gitignore`` file (for all projects) or
+    ``.git/info/exclude`` file (per project) to ignore them. See
+    [Github's documentation](https://help.github.com/articles/ignoring-files)
+
 .. tip::
 
     Windows users: when installing Git, the installer will ask what to do with
