Re: Documentation (mostly user manual) patches

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Junio C Hamano
Date: Sunday, March 4, 2007 - 8:14 pm

"J. Bruce Fields" <bfields@citi.umich.edu> writes:


Thanks.  I pulled first, but ended up rebasing them on top of
'maint', as the updated manual is still perfectly applicable for
1.5.0 series.

If it is not too much to ask, I'd prefer future pull insns for
two branches from your side.  Please maintain a fork of my
'maint' and a fork of my 'master' on your side, and apply all
updates to the manual that is applicable to 1.5.0 series on your
'maint'.  If there are updates to the manual that talks about
new material that will appear in 1.5.1, merge your 'maint' to
your 'master' and then apply the updates there.

That way, I can continue pulling your 'maint' to my 'maint' to
keep 1.5.0 series alive without worrying about contaminating
'maint' with new material that should appear only in 1.5.1.  At
the same time, pulling your 'master' to my 'master' will not
miss any updates to 'maint' and the manual that ships with 1.5.1
will talk about new stuff as well.

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Documentation (mostly user manual) patches, J. Bruce Fields, (Sun Mar 4, 2:59 pm)
[PATCH] user-manual: more detailed merge discussion, J. Bruce Fields, (Sun Mar 4, 2:59 pm)
Re: Documentation (mostly user manual) patches, Junio C Hamano, (Sun Mar 4, 8:14 pm)
Re: Documentation (mostly user manual) patches, J. Bruce Fields, (Mon Mar 5, 11:38 am)
Re: Documentation (mostly user manual) patches, Ramsay Jones, (Wed Mar 7, 1:19 pm)
Re: Documentation (mostly user manual) patches, J. Bruce Fields, (Sat Mar 10, 9:35 pm)
[PATCH 2/6] user-manual: fix inconsistent example, J. Bruce Fields, (Sat Mar 10, 9:35 pm)
[PATCH 5/6] user-manual: fix rendering of history diagrams, J. Bruce Fields, (Sat Mar 10, 9:35 pm)
Re: [PATCH 2/6] user-manual: fix inconsistent example, J. Bruce Fields, (Sat Mar 10, 9:39 pm)
Re: Documentation (mostly user manual) patches, Junio C Hamano, (Sat Mar 10, 10:35 pm)
Re: [PATCH 2/6] user-manual: fix inconsistent example, Ramsay Jones, (Tue Mar 13, 12:31 pm)
Re: [PATCH 2/6] user-manual: fix inconsistent example, J. Bruce Fields, (Wed Mar 14, 4:19 pm)