git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 3/7] contrib/subtree: Add --unannotate

From
greened@obbligato.org <greened@obbligato.org>
Date
Jan 16, 2013, 03:20 UTC
Message-ID
<87vcaxq0ez.fsf@waller.obbligato.org>
In-Reply-To
<7vehhvecoy.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 28 quoted lines
> "David A. Greene" <greened@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.
Ok, I'll take a look.
> I've applied all seven patches in the series with minor fix-ups, and
> will merge it to 'pu'.
Thanks!
                          -David
Previous: Junio C HamanoNext: greened@obbligato.org
Message 13 of 22 in “Revised git-subtree Patches”
  1. David A. GreeneJan 8, 2013
  2. 1/7 Remove Test Number CommentsDavid A. Greene, Jan 8, 2013
  3. 2/7 contrib/subtree: Use %B for Split Subject/BodyDavid A. Greene, Jan 8, 2013
  4. Junio C HamanoJan 8, 2013
  5. greened@obbligato.orgJan 16, 2013
  6. 郑文辉 (Techlive Zheng)Jan 8, 2013
  7. Junio C HamanoJan 9, 2013
  8. greened@obbligato.orgJan 16, 2013
  9. Junio C HamanoJan 16, 2013
  10. greened@obbligato.orgJan 22, 2013
  11. 3/7 contrib/subtree: Add --unannotateDavid A. Greene, Jan 8, 2013
  12. Junio C HamanoJan 8, 2013
  13. greened@obbligato.orgJan 16, 2013
  14. greened@obbligato.orgJan 16, 2013
  15. Junio C HamanoJan 16, 2013
  16. greened@obbligato.orgJan 22, 2013
  17. 4/7 contrib/subtree: Better Error Handling for addDavid A. Greene, Jan 8, 2013
  18. Junio C HamanoJan 8, 2013
  19. greened@obbligato.orgJan 16, 2013
  20. 5/7 contrib/subtree: Fix SynopsisDavid A. Greene, Jan 8, 2013
  21. 6/7 contrib/subtree: Honor DESTDIRDavid A. Greene, Jan 8, 2013
  22. 7/7 contrib/subtree: Make the Manual Directory if NeededDavid A. Greene, Jan 8, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.