Hi Junio, On Fri, 8 Jul 2011, Junio C Hamano wrote: > Martin von Zweigbergk <martin.von.zweigbergk@xxxxxxxxx> writes: > > > --skip:: > > Restart the rebasing process by skipping the current patch. > > diff --git a/git-rebase.sh b/git-rebase.sh > > index d7855ea..f2d4c72 100755 > > --- a/git-rebase.sh > > +++ b/git-rebase.sh > > @@ -58,7 +58,7 @@ ignore-whitespace! passed to 'git apply' > > C=! passed to 'git apply' > > Actions: > > continue! continue rebasing process > > -abort! abort rebasing process and restore original branch > > +abort! abort rebasing process and reset HEAD to <branch> > > skip! skip current patch and continue rebasing process > > " > > I don't think it is quite right to use placeholder notation here, unless > you are talking about "git rebase --abort <branch>", and you are of course > not in this case. Perhaps > > abort and check out the original branch > > might be slightly better. I dunno. Good point. I tried to find something that would fit in 80 characters and still not use the term "check out", but I agree that using the placeholder notation was a bad idea. I would be happy to change to your proposed text. Drew, I hope you don't mind. > As the user knows these help text are all about "rebase", I do not think > it is worth repeating "rebasing process" over and over again. I was thinking about changing "rebasing process" to "rebase", but removing it completely is probably good idea. Patch coming up. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html