Kong Lucien <Lucien.Kong@xxxxxxxxxxxxxxx> writes: > + # You are currently rebasing: fix conflicts and then run "git rebase -- continue". > + # If you would prefer to skip this patch, instead run "git rebase --skip". > + # To check out the original branch and stop rebasing run "git rebase --abort". You can use a small indentation to mark the fact that the next lines are related to the first, like done in the other messages of status: > + # Unmerged paths: > + # (use "git reset HEAD <file>..." to unstage) > + # (use "git add/rm <file>..." as appropriate to mark resolution) I'd have written it like this: + # You are currently rebasing: fix conflicts and then run "git rebase -- continue". + # If you would prefer to skip this patch, instead run "git rebase --skip". + # To check out the original branch and stop rebasing run "git rebase --abort". Same for other messages. > + # You are currently rebasing: fix conflicts and then run "git rebase -- continue". Extra space between -- and continue. You could refine the advice depending on whether conflicts are (still) present or not (like you did for merge). > +test_expect_success 'status in am progress : patch corrupted/wrong format' ' No space before :. > + # One of the patches is empty or corrupted ! No space before ! (I think I mentionned it for the C code, not sure). -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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