summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-08-20 05:39:48 -0500
committerJunio C Hamano <gitster@pobox.com>2010-08-20 14:16:51 -0700
commitb9190e79134ceea2ed0f4a3d1aa90ce6398858f7 (patch)
treeffc6d23d654ad6282f31584ebc0cfa8480aff710 /Documentation/git-rebase.txt
parent3c56c84eb8d6e74a6a0457ddc3853f2f0200acb5 (diff)
downloadgit-b9190e79134ceea2ed0f4a3d1aa90ce6398858f7.tar.gz
Documentation: do not convert ... operator to ellipses
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>
Diffstat (limited to 'Documentation/git-rebase.txt')
-rw-r--r--Documentation/git-rebase.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index b4314568f5..b8aa0b999d 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -207,7 +207,7 @@ OPTIONS
<upstream>. May be any valid commit, and not just an
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
leave out at most one of A and B, in which case it defaults to HEAD.