Merge branch 'master' into teeberg-master

Need latest master to proceed with test
Conflicts:
	doc/source/tutorial.rst

1 files changed, 1 insertions, 3 deletions

diff --git a/git/diff.py b/git/diff.py
index dfee00e2..37882369 100644
--- a/git/diff.py
+++ b/git/diff.py
@@ -42,7 +42,7 @@ class Diffable(object):
 
     def diff(self, other=Index, paths=None, create_patch=False, **kwargs):
         """Creates diffs between two items being trees, trees and index or an
-        index and the working tree.
+        index and the working tree. It will detect renames automatically.
 
         :param other:
             Is the item to compare us with.
@@ -68,8 +68,6 @@ class Diffable(object):
         :return: git.DiffIndex
 
         :note:
-            Rename detection will only work if create_patch is True.
-
             On a bare repository, 'other' needs to be provided as Index or as
             as Tree/Commit, or a git command error will occour"""
         args = list()