doc: normalize [--options] to [options] in git-diff
SYNOPSIS and other manuals use [options] but DESCRIPTION used [--options]. Signed-off-by: Andreas Heiduk <asheiduk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Andreas Heiduk committed
May 3, 2018 at 20:48 UTC
5356a3c3542774f05684b5c3999060492dce2e8d
1 file changed
+7
-7
Documentation/git-diff.txt
+7
-7
@@ -21,7 +21,7 @@ Show changes between the working tree and the index or a tree, changes
21
between the index and a tree, changes between two trees, changes between
22
two blob objects, or changes between two files on disk.
23
24
-'git diff' [--options] [--] [<path>...]::
24
+'git diff' [options] [--] [<path>...]::
25
26
This form is to view the changes you made relative to
27
the index (staging area for the next commit). In other
@@ -29,7 +29,7 @@ two blob objects, or changes between two files on disk.
29
further add to the index but you still haven't. You can
30
stage these changes by using linkgit:git-add[1].
31
32
-'git diff' [--options] --no-index [--] <path> <path>::
32
+'git diff' [options] --no-index [--] <path> <path>::
33
34
This form is to compare the given two paths on the
35
filesystem. You can omit the `--no-index` option when
@@ -38,7 +38,7 @@ two blob objects, or changes between two files on disk.
38
or when running the command outside a working tree
39
controlled by Git.
40
41
-'git diff' [--options] --cached [<commit>] [--] [<path>...]::
41
+'git diff' [options] --cached [<commit>] [--] [<path>...]::
42
43
This form is to view the changes you staged for the next
44
commit relative to the named <commit>. Typically you
@@ -48,7 +48,7 @@ two blob objects, or changes between two files on disk.
48
<commit> is not given, it shows all staged changes.
49
--staged is a synonym of --cached.
50
51
-'git diff' [--options] <commit> [--] [<path>...]::
51
+'git diff' [options] <commit> [--] [<path>...]::
52
53
This form is to view the changes you have in your
54
working tree relative to the named <commit>. You can
@@ -56,18 +56,18 @@ two blob objects, or changes between two files on disk.
56
branch name to compare with the tip of a different
57
branch.
58
59
-'git diff' [--options] <commit> <commit> [--] [<path>...]::
59
+'git diff' [options] <commit> <commit> [--] [<path>...]::
60
61
This is to view the changes between two arbitrary
62
<commit>.
63
64
-'git diff' [--options] <commit>..<commit> [--] [<path>...]::
64
+'git diff' [options] <commit>..<commit> [--] [<path>...]::
65
66
This is synonymous to the previous form. If <commit> on
67
one side is omitted, it will have the same effect as
68
using HEAD instead.
69
70
-'git diff' [--options] <commit>\...<commit> [--] [<path>...]::
70
+'git diff' [options] <commit>\...<commit> [--] [<path>...]::
71
72
This form is to view the changes on the branch containing
73
and up to the second <commit>, starting at a common ancestor