Merge remote-tracking branch 'upstream/master'

2 files changed, 19 insertions, 2 deletions

diff --git a/doc/source/changes.rst b/doc/source/changes.rst
index 428fa2b4..9f8ebb51 100644
--- a/doc/source/changes.rst
+++ b/doc/source/changes.rst
@@ -2,6 +2,18 @@
 Changelog
 =========
 
+2.0.8 - Bugfixes
+================
+
+* `DiffIndex.iter_change_type(...)` produces better results when diffing
+  an index against the working tree.
+
+2.0.7 - New Features
+====================
+
+* `IndexFile.commit(...,skip_hooks=False)` added. This parameter emulates the 
+   behaviour of `--no-verify` on the command-line.
+
 2.0.6 - Fixes and Features
 ==========================
 
diff --git a/doc/source/tutorial.rst b/doc/source/tutorial.rst
index b0ef273d..92020975 100644
--- a/doc/source/tutorial.rst
+++ b/doc/source/tutorial.rst
@@ -474,8 +474,13 @@ Using environment variables, you can further adjust the behaviour of the git com
 
 * **GIT_PYTHON_TRACE**
 
- * If set to non-0, all executed git commands will be logged using a python logger.
- * if set to *full*, the executed git command and its output on stdout and stderr will be logged using a python logger.
+ * If set to non-0, all executed git commands will be shown as they happen
+ * If set to *full*, the executed git command _and_ its entire output on stdout and stderr will be shown as they happen
+
+ **NOTE**: All logging is outputted using a Python logger, so make sure your program is configured to show INFO-level messages.  If this is not the case, try adding the following to your program::
+ 
+    import logging
+    logging.basicConfig(level=logging.INFO)
  
 * **GIT_PYTHON_GIT_EXECUTABLE**