Re: [QUESTION] Pushing patches.

[Ralf Wildenhues]

Hi Stefano,

* Stefano Lattarini wrote on Thu, Jul 15, 2010 at 12:26:57PM CEST:
[ git-merge-changelog ]
> However, there is a problem w.r.t. the Automake policy of keeping 
> multiple ChangeLog entries with same author and date lumped togheter. 
> In fact, git-merge-changelog seems to separate them when rebasing
> (see the attached script for an example).  IMVHO the best thing to do
> here is to change the Automake ChangeLog policy, using e.g.
> 
>   2000-01-01  Foo Bar  <address@hidden>
> 
>       Add foo
> 
>   2000-01-01  Foo Bar  <address@hidden>
> 
>       Add bar
> 
> instead of:
>   
>   2000-01-01  Foo Bar  <address@hidden>
> 
>       Add foo
> 
>       Add bar
> 
> WDYT?

Bruno prefers the former style, but maybe he accepts a patch to
optionally keep the style of the latter even upon rebasing.  I tend to
just run another rebase -i to remove the extra headers again, or ignore
the issue.

> And since we are at it, I have another question.  If I have N (> 1) 
> unrelated but simple patches to apply to maint, it's OK to apply
> all of them sequentially, and only then do the merges to master and 
> branch-1.11?

Yes, please, it's not only OK but I'd say strongly recommended.  The
current mode of operation already produces a lot of merge commits, and
at least the merges from maint add mostly noise to the history.

I'll try to update HACKING soon.

Cheers,
Ralf