aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-03 09:43:42 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-03 09:43:42 -0700
commitc0808fe70870f513a4fc020ec23500b88f8b1018 (patch)
tree6a5eb5d86124b2ec7d756a25c267978aedb7abc0 /Documentation/git-rebase.txt
parent2b916ffa18cb163a9d8f0060a9127e9b0a84b955 (diff)
parenta5218458009620ba5142438b01a0032ee00ea395 (diff)
downloadgit-c0808fe70870f513a4fc020ec23500b88f8b1018.tar.gz
git-c0808fe70870f513a4fc020ec23500b88f8b1018.tar.xz
Merge branch 'jn/doc-backslash'
* jn/doc-backslash: Documentation: remove stray backslash in show-branch discussion Documentation: remove stray backslashes from "Fighting regressions" article Documentation: do not convert ... operator to ellipses Documentation: avoid stray backslash in user manual Documentation: avoid stray backslashes in core tutorial Documentation: remove stray backslashes in rev-parse manual Documentation: remove backslash before ~ in fast-import manual Documentation: remove stray backslash from "git bundle" manual Documentation/technical: avoid stray backslash in parse-options API docs Documentation: remove backslashes in manpage synopses Documentation: clarify quoting in gitignore docs Documentation: clarify quoting in "git rm" example Documentation: add missing quotes to "git grep" examples Documentation: clarify quoting in "git add" example Documentation: unbreak regex in show-ref manual Documentation: quoting trouble in "git rm" discussion Documentation: tweak description of log.date
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 45c52d2e5..30e5c0eb1 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/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.