From cc120056a881101326488e3c5c2d3af2ce3a8de6 Mon Sep 17 00:00:00 2001 From: Sean Date: Sat, 13 May 2006 23:34:08 -0400 Subject: Make git rebase interactive help match documentation. Signed-off-by: Sean Estabrooks Signed-off-by: Junio C Hamano --- Documentation/git-rebase.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Documentation') diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 1b482abec..08ee4aaba 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -9,9 +9,7 @@ SYNOPSIS -------- 'git-rebase' [--onto ] [] -'git-rebase' --continue - -'git-rebase' --abort +'git-rebase' --continue | --skip | --abort DESCRIPTION ----------- @@ -23,9 +21,10 @@ not exist in the branch. It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure -and run `git rebase --continue`. If you can not resolve the merge -failure, running `git rebase --abort` will restore the original -and remove the working files found in the .dotest directory. +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 and remove the .dotest working files, use the command +`git rebase --abort` instead. Note that if is not specified on the command line, the currently checked out branch is used. -- cgit v1.2.1