mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash

Browse Source 
* jn/maint-doc-dashdash:
  Documentation: quote double-dash for AsciiDoc
This commit is contained in:
Junio C Hamano
2011-06-29 09:25:51 -07:00
parent f696543dad 565e135a1e
commit 347231f735
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config.txt
View File

@ -676,7 +676,7 @@ branch.<name>.rebase::
browser.<tool>.cmd:: browser.<tool>.cmd::
Specify the command to invoke the specified browser. The Specify the command to invoke the specified browser. The
specified command is evaluated in shell with the URLs passed 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:: browser.<tool>.path::
Override the path for the given tool that may be used to Override the path for the given tool that may be used to

2
Documentation/git-commit.txt
View File

@ -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 your working tree are temporarily stored to a staging area
called the "index" with 'git add'. A file can be called the "index" with 'git add'. A file can be
reverted back, only in the index but not in the working tree, 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 which effectively reverts 'git add' and prevents the changes to
this file from participating in the next commit. After building this file from participating in the next commit. After building
the state to be committed incrementally with these commands, the state to be committed incrementally with these commands,

2
Documentation/git-mergetool--lib.txt
View File

@ -7,7 +7,7 @@ git-mergetool--lib - Common git merge tool shell scriptlets
SYNOPSIS SYNOPSIS
-------- --------
'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"' 'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool{litdd}lib"'
DESCRIPTION DESCRIPTION
----------- -----------

2
Documentation/git-revert.txt
View File

@ -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 should see linkgit:git-reset[1], particularly the '--hard' option. If
you want to extract specific files as they were in another commit, you you want to extract specific files as they were in another commit, you
should see linkgit:git-checkout[1], specifically the `git checkout 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. both will discard uncommitted changes in your working directory.
OPTIONS OPTIONS

2
Documentation/git-submodule.txt
View File

@ -172,7 +172,7 @@ sync::
repositories accordingly. repositories accordingly.
+ +
"git submodule sync" synchronizes all submodules while "git submodule sync" synchronizes all submodules while
"git submodule sync -- A" synchronizes submodule "A" only. "git submodule sync \-- A" synchronizes submodule "A" only.
OPTIONS OPTIONS
------- -------

2
Documentation/git-web--browse.txt
View File

@ -68,7 +68,7 @@ browser.<tool>.path
You can explicitly provide a full path to your preferred browser by You can explicitly provide a full path to your preferred browser by
setting the configuration variable 'browser.<tool>.path'. For example, setting the configuration variable 'browser.<tool>.path'. For example,
you can configure the absolute path to firefox by setting 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. is available in PATH.
browser.<tool>.cmd browser.<tool>.cmd

2
Documentation/rev-list-options.txt
View File

@ -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: each merge. The commits are:
* `I` is the initial commit, in which `foo` exists with contents * `I` is the initial commit, in which `foo` exists with contents