author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | |
Thu, 14 Jul 2011 03:47:06 +0000 (23:47 -0400) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 14 Jul 2011 05:03:12 +0000 (22:03 -0700) | ||
commit | 5960bc9d63c2cd9dc7eb9d44f470d516579f1bd6 | |
tree | 5cc29a3e85c68ed4ec0b4e0a7ce789dc1dc853f3 | tree | snapshot |
parent | d28790dc31ca1bcdca7254a6b9381b6c84e91271 | commit | diff |
rebase: clarify "restore the original branch"
The description for 'git rebase --abort' currently says:
Restore the original branch and abort the rebase operation.
The "restore" can be misinterpreted to imply that the original branch
was somehow in a broken state during the rebase operation. It is also
not completely clear what "the original branch" is --- is it the
branch that was checked out before the rebase operation was called or
is the the branch that is being rebased (it is the latter)? Although
both issues are made clear in the DESCRIPTION section, let us also
make the entry in the OPTIONS secion more clear.
Also remove the term "rebasing process" from the usage text, since the
user already knows that the text is about "git rebase".
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The description for 'git rebase --abort' currently says:
Restore the original branch and abort the rebase operation.
The "restore" can be misinterpreted to imply that the original branch
was somehow in a broken state during the rebase operation. It is also
not completely clear what "the original branch" is --- is it the
branch that was checked out before the rebase operation was called or
is the the branch that is being rebased (it is the latter)? Although
both issues are made clear in the DESCRIPTION section, let us also
make the entry in the OPTIONS secion more clear.
Also remove the term "rebasing process" from the usage text, since the
user already knows that the text is about "git rebase".
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rebase.txt | diff | blob | history | |
git-rebase.sh | diff | blob | history |