"David A. Greene" <gree...@obbligato.org> writes: > diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt > index c5bce41..75aa690 100644 > --- a/contrib/subtree/git-subtree.txt > +++ b/contrib/subtree/git-subtree.txt > @@ -198,6 +198,21 @@ OPTIONS FOR split > git subtree tries to make it work anyway, particularly > if you use --rejoin, but it may not always be effective. > > +--unannotate=<annotation>:: > + This option is only valid for the split command. > + > + When generating synthetic history, try to remove the prefix > + <annotation> from each commit message (using bash's "strip > + shortest match from beginning" command, which supports > + globbing). This makes sense if you format library commits > + like "library: Change something or other" when you're working > + in your project's repository, but you want to remove this > + prefix when pushing back to the library's upstream repository. > + (In this case --unannotate='*: ' would work well.) > + > + Like --annotate, you need to use the same <annotation> > + whenever you split, or you may run into problems.
I think this paragraph inherits existing breakage from the beginning of time, but I do not think the above will format the second and subsequent paragraphs correctly. I've applied all seven patches in the series with minor fix-ups, and will merge it to 'pu'. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
