summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-12-17 11:36:38 -0800
committerJunio C Hamano <gitster@pobox.com>2013-12-17 11:36:38 -0800
commitc8394bb46667c059f00433224f09bda8de878128 (patch)
tree0c504495ce36b4a7d644a5f433ef5548c0aef355
parent5712dcb209b074a99e1c935eadc8e80d56eaf5b4 (diff)
parent0b7e4e0da4cf311d106fdc27e9eb46a73d0731c4 (diff)
downloadgit-c8394bb46667c059f00433224f09bda8de878128.tar.gz
Merge branch 'jj/doc-markup-gitcli' into maint
* jj/doc-markup-gitcli: Documentation/gitcli.txt: fix double quotes
-rw-r--r--Documentation/gitcli.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt
index 3146413cce..41bed2983f 100644
--- a/Documentation/gitcli.txt
+++ b/Documentation/gitcli.txt
@@ -83,12 +83,12 @@ scripting Git:
`git log -1 HEAD` but write `git log -1 HEAD --`; the former will not work
if you happen to have a file called `HEAD` in the work tree.
- * many commands allow a long option "--option" to be abbreviated
+ * many commands allow a long option `--option` to be abbreviated
only to their unique prefix (e.g. if there is no other option
- whose name begins with "opt", you may be able to spell "--opt" to
- invoke the "--option" flag), but you should fully spell them out
+ whose name begins with `opt`, you may be able to spell `--opt` to
+ invoke the `--option` flag), but you should fully spell them out
when writing your scripts; later versions of Git may introduce a
- new option whose name shares the same prefix, e.g. "--optimize",
+ new option whose name shares the same prefix, e.g. `--optimize`,
to make a short prefix that used to be unique no longer unique.
@@ -149,7 +149,7 @@ prefix of a long option as if it is fully spelled out, but use this
with a caution. For example, `git commit --amen` behaves as if you
typed `git commit --amend`, but that is true only until a later version
of Git introduces another option that shares the same prefix,
-e.g `git commit --amenity" option.
+e.g. `git commit --amenity` option.
Separating argument from the option