git and appending merge commits

Hi all,

I've recently started using Git and it is a very nice tool. During some merging, I've come upon one type of issue that seems to be a bug somewhere. To reproduce,

  1. branch master
  2. branch upstream
  3. add new version to upstream
  4. merge it to master
  5. append master merge changeset

#5 results in "messsed up" diffs

For an example of such a mess up please see,

http://git.debian.org/?p=collab-maint/mrtg.git;a=commitdiff;h=a8bc78ffd6d51ab09a791fa97e25f57b60eecd06

It appears that the tool generates a patch to a patch and displays that instead of the appended merge diff which is what I would have expected..

Is current output by design?

- Adam

PS. I should have probably used a new commit to do that changelog addition instead of appending the merge!