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

Documentation: do not convert ... operator to ellipses

Browse Source 
The symmetric difference or merge-base operator ... as used by
rev-list and diff is actually three period characters.  If it
gets replaced by an ellipsis glyph in the manual, that would
stop readers from copying and pasting it.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder
2010-08-20 05:39:48 -05:00
committed by Junio C Hamano
parent 3c56c84eb8
commit b9190e7913
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-checkout.txt
View File

@ -187,7 +187,7 @@ As a special case, the `"@\{-N\}"` syntax for the N-th last branch
checks out the branch (instead of detaching). You may also specify checks out the branch (instead of detaching). You may also specify
`-` which is synonymous with `"@\{-1\}"`. `-` which is synonymous with `"@\{-1\}"`.
+ +
As a further special case, you may use `"A...B"` as a shortcut for the As a further special case, you may use `"A\...B"` as a shortcut for the
merge base of `A` and `B` if there is exactly one merge base. You can merge base of `A` and `B` if there is exactly one merge base. You can
leave out at most one of `A` and `B`, in which case it defaults to `HEAD`. leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.

2
Documentation/git-push.txt
View File

@ -200,7 +200,7 @@ summary::
For a successfully pushed ref, the summary shows the old and new For a successfully pushed ref, the summary shows the old and new
values of the ref in a form suitable for using as an argument to values of the ref in a form suitable for using as an argument to
`git log` (this is `<old>..<new>` in most cases, and `git log` (this is `<old>..<new>` in most cases, and
`<old>...<new>` for forced non-fast-forward updates). `<old>\...<new>` for forced non-fast-forward updates).
+ +
For a failed update, more details are given: For a failed update, more details are given:
+ +

2
Documentation/git-rebase.txt
View File

@ -207,7 +207,7 @@ OPTIONS
<upstream>. May be any valid commit, and not just an <upstream>. May be any valid commit, and not just an
existing branch name. existing branch name.
+ +
As a special case, you may use "A...B" as a shortcut for the As a special case, you may use "A\...B" as a shortcut for the
merge base of A and B if there is exactly one merge base. You can merge base of A and B if there is exactly one merge base. You can
leave out at most one of A and B, in which case it defaults to HEAD. leave out at most one of A and B, in which case it defaults to HEAD.

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

@ -321,7 +321,7 @@ excluded from the output.
reflog entries from the most recent one to older ones. reflog entries from the most recent one to older ones.
When this option is used you cannot specify commits to When this option is used you cannot specify commits to
exclude (that is, '{caret}commit', 'commit1..commit2', exclude (that is, '{caret}commit', 'commit1..commit2',
nor 'commit1...commit2' notations cannot be used). nor 'commit1\...commit2' notations cannot be used).
+ +
With '\--pretty' format other than oneline (for obvious reasons), With '\--pretty' format other than oneline (for obvious reasons),
this causes the output to have two extra lines of information this causes the output to have two extra lines of information