The current branch is reset to <upstream>, or <newbase> if the
--onto option was supplied. This has the exact same effect as
The current branch is reset to <upstream>, or <newbase> if the
--onto option was supplied. This has the exact same effect as
The commits that were previously saved into the temporary area are
then reapplied to the current branch, one by one, in order. Note that
The commits that were previously saved into the temporary area are
then reapplied to the current branch, one by one, in order. Note that
completely automatic. You will have to resolve any such merge failure
and run `git rebase --continue`. Another option is to bypass the commit
that caused the merge failure with `git rebase --skip`. To restore the
completely automatic. You will have to resolve any such merge failure
and run `git rebase --continue`. Another option is to bypass the commit
that caused the merge failure with `git rebase --skip`. To restore the
-original <branch> and remove the .dotest working files, use the command
-`git rebase --abort` instead.
+original <branch> and remove the .git/rebase-apply working files, use the
+command `git rebase --abort` instead.