summaryrefslogtreecommitdiffstats
path: root/gitcli.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-10-23 14:45:54 -0700
committerJunio C Hamano <gitster@pobox.com>2023-10-23 14:45:54 -0700
commit33be82183d4cd6dc645f64da1402cf9a3f4cdbf3 (patch)
tree4a681cad5c6da23a7d7f56022666fb31397026d2 /gitcli.html
parent359f02427091f2c0fcac4eb7651fe5d159b84a54 (diff)
downloadgit-htmldocs-33be82183d4cd6dc645f64da1402cf9a3f4cdbf3.tar.gz
Autogenerated HTML docs for v2.42.0-482-g2e8e7
Diffstat (limited to 'gitcli.html')
-rw-r--r--gitcli.html10
1 files changed, 5 insertions, 5 deletions
diff --git a/gitcli.html b/gitcli.html
index 63e928d3e..4ed8ec24f 100644
--- a/gitcli.html
+++ b/gitcli.html
@@ -765,10 +765,10 @@ Options come first and then args.
A subcommand may take dashed options (which may take their own
arguments, e.g. "--max-parents 2") and arguments. You SHOULD
give dashed options first and then arguments. Some commands may
- accept dashed options after you have already gave non-option
+ accept dashed options after you have already given non-option
arguments (which may make the command ambiguous), but you should
not rely on it (because eventually we may find a way to fix
- these ambiguity by enforcing the "options then args" rule).
+ these ambiguities by enforcing the "options then args" rule).
</p>
</li>
<li>
@@ -785,7 +785,7 @@ When an argument can be misunderstood as either a revision or a path,
they can be disambiguated by placing <code>--</code> between them.
E.g. <code>git diff -- HEAD</code> is, "I have a file called HEAD in my work
tree. Please show changes between the version I staged in the index
- and what I have in the work tree for that file", not "show difference
+ and what I have in the work tree for that file", not "show the difference
between the HEAD commit and the work tree as a whole". You can say
<code>git diff HEAD --</code> to ask for the latter.
</p>
@@ -793,7 +793,7 @@ When an argument can be misunderstood as either a revision or a path,
<li>
<p>
Without disambiguating <code>--</code>, Git makes a reasonable guess, but errors
- out and asking you to disambiguate when ambiguous. E.g. if you have a
+ out and asks you to disambiguate when ambiguous. E.g. if you have a
file called HEAD in your work tree, <code>git diff HEAD</code> is ambiguous, and
you have to say either <code>git diff HEAD --</code> or <code>git diff -- HEAD</code> to
disambiguate.
@@ -1052,7 +1052,7 @@ The two options can be specified together to ask a command to work
<div id="footer">
<div id="footer-text">
Last updated
- 2022-02-16 17:29:08 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>