Merge branch 'stable'

[stgit] / examples / gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index cd9b569..c16f786 100644 (file)
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -95,6 +95,10 @@
        # The maximum length of an automatically generated patch name
        #namelenth = 30
 
+       # Extra options to pass to "git diff" (extend/override with
+       # -O/--diff-opts). For example, -M turns on rename detection.
+       #diff-opts = -M
+
 [mail "alias"]
        # E-mail aliases used with the 'mail' command
        git = git@vger.kernel.org