diff options
Diffstat (limited to 'man7/gitcli.7')
| -rw-r--r-- | man7/gitcli.7 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/man7/gitcli.7 b/man7/gitcli.7 index c91677a00..c4fd207f8 100644 --- a/man7/gitcli.7 +++ b/man7/gitcli.7 @@ -2,12 +2,12 @@ .\" Title: gitcli .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITCLI" "7" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITCLI" "7" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -46,7 +46,7 @@ Many commands take revisions (most often "commits", but sometimes "tree\-ish", d .sp -1 .IP \(bu 2.3 .\} -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 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)\&. +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 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 ambiguities by enforcing the "options then args" rule)\&. .RE .sp .RS 4 @@ -81,7 +81,7 @@ When an argument can be misunderstood as either a revision or a path, they can b \fB\-\-\fR between them\&. E\&.g\&. \fBgit diff \-\- HEAD\fR -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 between the HEAD commit and the work tree as a whole"\&. You can say +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 the difference between the HEAD commit and the work tree as a whole"\&. You can say \fBgit diff HEAD \-\-\fR to ask for the latter\&. .RE @@ -95,7 +95,7 @@ to ask for the latter\&. .IP \(bu 2.3 .\} Without disambiguating -\fB\-\-\fR, Git makes a reasonable guess, but errors out and asking you to disambiguate when ambiguous\&. E\&.g\&. if you have a file called HEAD in your work tree, +\fB\-\-\fR, Git makes a reasonable guess, but errors out and asks you to disambiguate when ambiguous\&. E\&.g\&. if you have a file called HEAD in your work tree, \fBgit diff HEAD\fR is ambiguous, and you have to say either \fBgit diff HEAD \-\-\fR |