summaryrefslogtreecommitdiffstats
path: root/git-diff.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-02-05 15:33:56 -0800
committerJunio C Hamano <gitster@pobox.com>2019-02-05 15:33:56 -0800
commit2567b326fac6961a6fc6075ad2f22a744252f2f3 (patch)
tree2e4c640f64f1f8f00b992e414a2fd316aea798d4 /git-diff.html
parentcf7310088e7328f8aa7ea2c5de767ef9499b5d78 (diff)
downloadgit-htmldocs-2567b326fac6961a6fc6075ad2f22a744252f2f3.tar.gz
Autogenerated HTML docs for v2.20.1-519-g8fedd
Diffstat (limited to 'git-diff.html')
-rw-r--r--git-diff.html20
1 files changed, 10 insertions, 10 deletions
diff --git a/git-diff.html b/git-diff.html
index 93ceb3fd9..3accdc753 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -2688,13 +2688,13 @@ Changes in the working tree not yet staged for the next commit.
<li>
<p>
Changes between the index and your last commit; what you
-would be committing if you run "git commit" without "-a" option.
+ would be committing if you run "git commit" without "-a" option.
</p>
</li>
<li>
<p>
Changes in the working tree since your last commit; what you
-would be committing if you run "git commit -a"
+ would be committing if you run "git commit -a"
</p>
</li>
</ol></div>
@@ -2713,14 +2713,14 @@ $ git diff HEAD^ HEAD <b>&lt;3&gt;</b></code></pre>
<li>
<p>
Instead of using the tip of the current branch, compare with the
-tip of "test" branch.
+ tip of "test" branch.
</p>
</li>
<li>
<p>
Instead of comparing with the tip of "test" branch, compare with
-the tip of the current branch, but limit the comparison to the
-file "test".
+ the tip of the current branch, but limit the comparison to the
+ file "test".
</p>
</li>
<li>
@@ -2754,7 +2754,7 @@ Same as above.
<li>
<p>
Changes that occurred on the master branch since when the topic
-branch was started off it.
+ branch was started off it.
</p>
</li>
</ol></div>
@@ -2773,13 +2773,13 @@ $ git diff arch/i386 include/asm-i386 <b>&lt;3&gt;</b></code></pre>
<li>
<p>
Show only modification, rename, and copy, but not addition
-or deletion.
+ or deletion.
</p>
</li>
<li>
<p>
Show only names and the nature of change, but not actual
-diff output.
+ diff output.
</p>
</li>
<li>
@@ -2802,7 +2802,7 @@ $ git diff -R <b>&lt;2&gt;</b></code></pre>
<li>
<p>
Spend extra cycles to find renames, copies and complete
-rewrites (very expensive).
+ rewrites (very expensive).
</p>
</li>
<li>
@@ -2837,7 +2837,7 @@ Output diff in reverse.
<div id="footer">
<div id="footer-text">
Last updated
- 2018-10-25 23:36:57 PDT
+ 2019-02-05 15:33:20 PST
</div>
</div>
</body>