[PATCHv3 1/2] git-rebase.txt: "--onto" option updated
From: Lucien Kong <hidden>
Date: 2016-06-15 22:54:01
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
The description of the option "--onto" is changed to be consistent with the format of the other options. Signed-off-by: Lucien Kong <redacted> Signed-off-by: Valentin Duperray <redacted> Signed-off-by: Franck Jonas <redacted> Signed-off-by: Thomas Nguy <redacted> Signed-off-by: Huynh Khoi Nguyen Nguyen <redacted> Signed-off-by: Matthieu Moy <redacted> --- Documentation/git-rebase.txt | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 147fa1a..d2a510c 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt@@ -210,11 +210,13 @@ rebase.autosquash:: OPTIONS ------- -<newbase>:: - Starting point at which to create the new commits. If the - --onto option is not specified, the starting point is - <upstream>. May be any valid commit, and not just an - existing branch name. +--onto <newbase>:: + With this option, git rebase takes all commits from <branch>, + that are not in <upstream>, and transplants them on top of + <newbase>. <newbase is the starting point at which to create + the new commits. If the --onto option is not specified, the + starting point is <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 merge base of A and B if there is exactly one merge base. You can
--
1.7.8