aboutsummaryrefslogtreecommitdiff
path: root/gitk-git
diff options
context:
space:
mode:
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>2011-07-13 23:47:06 -0400
committerJunio C Hamano <gitster@pobox.com>2011-07-13 22:03:12 -0700
commit5960bc9d63c2cd9dc7eb9d44f470d516579f1bd6 (patch)
tree5cc29a3e85c68ed4ec0b4e0a7ce789dc1dc853f3 /gitk-git
parentd28790dc31ca1bcdca7254a6b9381b6c84e91271 (diff)
downloadgit-5960bc9d63c2cd9dc7eb9d44f470d516579f1bd6.tar.gz
git-5960bc9d63c2cd9dc7eb9d44f470d516579f1bd6.tar.xz
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>
Diffstat (limited to 'gitk-git')
0 files changed, 0 insertions, 0 deletions