Re: How to change merge message ("weenie commits")

From: Seth Falcon <sethfalcon@gmail.com>
Date: Jan 25, 2007, 16:12 UTC
Message-ID: <m2veiv9jbp.fsf@ziti.local>
In-Reply-To: <17848.54065.631799.755255@lisa.zopyra.com>

Bill Lear <rael@zopyra.com> writes:

Show 7 quoted lines

> So, when I merge my topic branch onto master, for example, I'd like
> the commit message to be something more thoughtful than the
> "checkpoint 1", "checkpoint 2", "fix typo", "redo sort algorithm",
> etc., etc., and be more like a short set of release notes, a summary
> of what all has been accomplished.
>
> Do others run into this and perhaps have a good solution?

Suppose you do your daily work on branch weenie, then one way would be:

  git format-patch -k master..weenie
  git checkout master
  git apply 00*.patch
  ## review, then git add and git commit where you would write a long
  ## commit message.

One nice thing about this workflow is that you can easily decide if you want one single commit or a few commits to group logical groups of the patch files.

+ seth