X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=Documentation%2Fgit-rebase.txt;h=b30ed352e5a3f87d24119624966c33b4c194df5a;hb=0cd993a778d7c14bed34f624fce46724242557ed;hp=2d71e4b975db3355c6de9005e77a701e18723539;hpb=f06d47e7e0d9db709ee204ed13a8a7486149f494;p=~andy%2Fgit

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 2d71e4b97..b30ed352e 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 [verse]
 'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>]
 	[<upstream>] [<branch>]
-'git rebase' [-i | --interactive] [options] [--exec <cmd>] --onto <newbase>
+'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>]
 	--root [<branch>]
 'git rebase' --continue | --skip | --abort
 
@@ -369,10 +369,11 @@ squash/fixup series.
 --root::
 	Rebase all commits reachable from <branch>, instead of
 	limiting them with an <upstream>.  This allows you to rebase
-	the root commit(s) on a branch.  Must be used with --onto, and
+	the root commit(s) on a branch.  When used with --onto, it
 	will skip changes already contained in <newbase> (instead of
-	<upstream>).  When used together with --preserve-merges, 'all'
-	root commits will be rewritten to have <newbase> as parent
+	<upstream>) whereas without --onto it will operate on every change.
+	When used together with both --onto and --preserve-merges,
+	'all' root commits will be rewritten to have <newbase> as parent
 	instead.
 
 --autosquash::