Re: Orgmode[PATCH 4/4] Add handling of blockquote and output formats that must be flowed.

[Robert Goldman <rpgoldman@real-time.com>]

On 4/29/10 Apr 29 -12:00 PM, Bernt Hansen wrote:
> Robert Goldman <rpgoldman@real-time.com> writes:
> 
>> On 4/29/10 Apr 29 -8:58 AM, Carsten Dominik wrote:
>>> Applied, thanks.
>>>
>>> I had two email saying patch 4/4, I too one of them, what happened with
>>> 1/4, 2/4, 3/4?
>>
>> What happened was that I am incompetent with git.  Somehow git thinks
>> that my copy is four patches away from origin/master.  But, in fact,
>> only the last patch (hence 4/4) is a bona fide diff from origin/master
>> (your version).
>>
>> To use a cliche, I need to figure out how to convince git that I am now
>> on the same page as the origin.  I think this may have something to do
>> with submitting patches by email instead of pushing them.  I will try to
>> figure this out before submitting my next patch.
> 
> git format-patch -1
> 
> should give you a single patch with no numbers.  You can specify how
> many commits to include with -n  (eg. git format-patch -3 ) and it
> numbers the 3 patches appropriately.
> 
> You can turn off the patch numbering if they are unrelated with
> --no-numbered.
> 
> If you are using git send-email it uses the same format-patch parameters
> IIRC.
> 
> I use git send-email --annotate
> 
> which brings each patch into an edit buffer where I can add extra
> (non-commit message) information before the diffstat.

Thanks, Bernt.  That's /very/ helpful.  git send-email and format-patch
have a pretty overwhelming set of options, and this will help me focus
on the ones I should use.

A quick follow-up --- I got into trouble by sending patches computed
versus origin/master.  It turns out that this is not what I (or anyone
else, I would have thought) wants.  What I want is to get patches
relative to the merge commit that brings together my local commits and
origin/master.  Is there a common way to encourage git to do that?

thanks,
r