Skip to content

Commit

Permalink
Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash
Browse files Browse the repository at this point in the history
* jn/maint-doc-dashdash:
  Documentation: quote double-dash for AsciiDoc
  • Loading branch information
Junio C Hamano committed Jun 29, 2011
2 parents f696543 + 565e135 commit 347231f
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ branch.<name>.rebase::
browser.<tool>.cmd::
Specify the command to invoke the specified browser. The
specified command is evaluated in shell with the URLs passed
as arguments. (See linkgit:git-web--browse[1].)
as arguments. (See linkgit:git-web{litdd}browse[1].)

browser.<tool>.path::
Override the path for the given tool that may be used to
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-commit.txt
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ When recording your own work, the contents of modified files in
your working tree are temporarily stored to a staging area
called the "index" with 'git add'. A file can be
reverted back, only in the index but not in the working tree,
to that of the last commit with `git reset HEAD -- <file>`,
to that of the last commit with `git reset HEAD \-- <file>`,
which effectively reverts 'git add' and prevents the changes to
this file from participating in the next commit. After building
the state to be committed incrementally with these commands,
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-mergetool--lib.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ git-mergetool--lib - Common git merge tool shell scriptlets

SYNOPSIS
--------
'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"'
'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool{litdd}lib"'

DESCRIPTION
-----------
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-revert.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ throw away all uncommitted changes in your working directory, you
should see linkgit:git-reset[1], particularly the '--hard' option. If
you want to extract specific files as they were in another commit, you
should see linkgit:git-checkout[1], specifically the `git checkout
<commit> -- <filename>` syntax. Take care with these alternatives as
<commit> \-- <filename>` syntax. Take care with these alternatives as
both will discard uncommitted changes in your working directory.

OPTIONS
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-submodule.txt
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ sync::
repositories accordingly.
+
"git submodule sync" synchronizes all submodules while
"git submodule sync -- A" synchronizes submodule "A" only.
"git submodule sync \-- A" synchronizes submodule "A" only.

OPTIONS
-------
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-web--browse.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ browser.<tool>.path
You can explicitly provide a full path to your preferred browser by
setting the configuration variable 'browser.<tool>.path'. For example,
you can configure the absolute path to firefox by setting
'browser.firefox.path'. Otherwise, 'git web--browse' assumes the tool
'browser.firefox.path'. Otherwise, 'git web{litdd}browse' assumes the tool
is available in PATH.

browser.<tool>.cmd
Expand Down
2 changes: 1 addition & 1 deletion Documentation/rev-list-options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ that you are filtering for a file `foo` in this commit graph:
\ / / / /
`-------------'
-----------------------------------------------------------------------
The horizontal line of history A--P is taken to be the first parent of
The horizontal line of history A---P is taken to be the first parent of
each merge. The commits are:

* `I` is the initial commit, in which `foo` exists with contents
Expand Down

0 comments on commit 347231f

Please sign in to comment.