@@ -68,13 +68,13 @@ files on disk.
68
68
This form is to view the results of a merge commit. The first
69
69
listed <commit> must be the merge itself; the remaining two or
70
70
more commits should be its parents. A convenient way to produce
71
- the desired set of revisions is to use the {caret}@ suffix.
71
+ the desired set of revisions is to use the `^@` suffix.
72
72
For instance, if `master` names a merge commit, `git diff master
73
73
master^@` gives the same combined diff as `git show master`.
74
74
75
75
'git diff' [<options>] <commit>..<commit> [--] [<path>...]::
76
76
77
- This is synonymous to the earlier form (without the ".." ) for
77
+ This is synonymous to the earlier form (without the `..` ) for
78
78
viewing the changes between two arbitrary <commit>. If <commit> on
79
79
one side is omitted, it will have the same effect as
80
80
using HEAD instead.
@@ -83,20 +83,20 @@ files on disk.
83
83
84
84
This form is to view the changes on the branch containing
85
85
and up to the second <commit>, starting at a common ancestor
86
- of both <commit>. " git diff A\ ...B" is equivalent to
87
- " git diff $(git merge-base A B) B" . You can omit any one
86
+ of both <commit>. ` git diff A...B` is equivalent to
87
+ ` git diff $(git merge-base A B) B` . You can omit any one
88
88
of <commit>, which has the same effect as using HEAD instead.
89
89
90
90
Just in case you are doing something exotic, it should be
91
91
noted that all of the <commit> in the above description, except
92
- in the last two forms that use ".." notations, can be any
92
+ in the last two forms that use `..` notations, can be any
93
93
<tree>.
94
94
95
95
For a more complete list of ways to spell <commit>, see
96
96
"SPECIFYING REVISIONS" section in linkgit:gitrevisions[7].
97
97
However, "diff" is about comparing two _endpoints_, not ranges,
98
- and the range notations (" <commit>..<commit>" and
99
- " <commit>\ ...<commit>" ) do not mean a range as defined in the
98
+ and the range notations (` <commit>..<commit>` and
99
+ ` <commit>...<commit>` ) do not mean a range as defined in the
100
100
"SPECIFYING RANGES" section in linkgit:gitrevisions[7].
101
101
102
102
'git diff' [<options>] <blob> <blob>::
@@ -144,9 +144,9 @@ $ git diff HEAD <3>
144
144
+
145
145
<1> Changes in the working tree not yet staged for the next commit.
146
146
<2> Changes between the index and your last commit; what you
147
- would be committing if you run " git commit" without "-a" option.
147
+ would be committing if you run ` git commit` without `-a` option.
148
148
<3> Changes in the working tree since your last commit; what you
149
- would be committing if you run " git commit -a"
149
+ would be committing if you run ` git commit -a`
150
150
151
151
Comparing with arbitrary commits::
152
152
+
0 commit comments