summaryrefslogtreecommitdiffstats
path: root/git-rebase.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-09-03 21:33:06 +0000
committerJunio C Hamano <junio@kernel.org>2010-09-03 21:33:06 +0000
commit2db3e750d172a78dadfb29235ad2a2c3c8d45a24 (patch)
tree1f66627398f37b23ec3af2697514d33d25060d96 /git-rebase.txt
parentd7ae629d13f3242b66070b20f4bb83486948150a (diff)
downloadgit-htmldocs-2db3e750d172a78dadfb29235ad2a2c3c8d45a24.tar.gz
Autogenerated HTML docs for v1.7.2.3-313-gcd15
Diffstat (limited to 'git-rebase.txt')
-rw-r--r--git-rebase.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt
index 45c52d2e5..30e5c0eb1 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -210,7 +210,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.