parse-options: remove unused OPT_SET_PTR

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 5effe97991c731ead12b817f1bd6c8a979bc9591..56fb7e532227fa8a69b9e9ada92a1d8eb330c7d6 100644 (file)
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -25,13 +25,18 @@ two blob objects, or changes between two files on disk.
 
        This form is to view the changes you made relative to
        the index (staging area for the next commit).  In other
-       words, the differences are what you _could_ tell git to
+       words, the differences are what you _could_ tell Git to
        further add to the index but you still haven't.  You can
        stage these changes by using linkgit:git-add[1].
-+
-If exactly two paths are given and at least one points outside
-the current repository, 'git diff' will compare the two files /
-directories. This behavior can be forced by --no-index.
+
+'git diff' --no-index [--options] [--] [<path>...]::
+
+       This form is to compare the given two paths on the
+       filesystem.  You can omit the `--no-index` option when
+       running the command in a working tree controlled by Git and
+       at least one of the paths points outside the working tree,
+       or when running the command outside a working tree
+       controlled by Git.
 
 'git diff' [--options] --cached [<commit>] [--] [<path>...]::
 
@@ -39,7 +44,7 @@ directories. This behavior can be forced by --no-index.
        commit relative to the named <commit>.  Typically you
        would want comparison with the latest commit, so if you
        do not give <commit>, it defaults to HEAD.
-       If HEAD does not exist (e.g. unborned branches) and
+       If HEAD does not exist (e.g. unborn branches) and
        <commit> is not given, it shows all staged changes.
        --staged is a synonym of --cached.