-<p>git-rebase applies to <upstream> (or optionally to <newbase>) commits\r
-from <branch> that do not appear in <upstream>. When <branch> is not\r
-specified it defaults to the current branch (HEAD).</p>\r
-<p>When git-rebase is complete, <branch> will be updated to point to the\r
-newly created line of commit objects, so the previous line will not be\r
-accessible unless there are other references to it already.</p>\r
+<p>git-rebase replaces <branch> with a new branch of the same name. When\r
+the --onto option is provided the new branch starts out with a HEAD equal\r
+to <newbase>, otherwise it is equal to <upstream>. It then attempts to\r
+create a new commit for each commit from the original <branch> that does\r
+not exist in the <upstream> branch.</p>\r
+<p>It is possible that a merge failure will prevent this process from being\r
+completely automatic. You will have to resolve any such merge failure\r
+and run <tt>git rebase --continue</tt>. Another option is to bypass the commit\r
+that caused the merge failure with <tt>git rebase --skip</tt>. To restore the\r
+original <branch> and remove the .dotest working files, use the command\r
+<tt>git rebase --abort</tt> instead.</p>\r
+<p>Note that if <branch> is not specified on the command line, the currently\r
+checked out branch is used.</p>\r