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

From: J. Bruce Fields <bfields@fieldses.org>
Date: Jan 25, 2007, 16:07 UTC
Message-ID: <20070125160714.GA6358@fieldses.org>
In-Reply-To: <17848.54065.631799.755255@lisa.zopyra.com>

On Thu, Jan 25, 2007 at 09:56:33AM -0600, Bill Lear wrote:

Show 19 quoted lines

> I have developed a habit of using my SCM to provide local backup of my
> daily (hourly) work.  I often will work to a stopping point and commit
> my work, without any real coherence to the commit --- a sort of
> checkpoint.  These I call "weenie commits" because they are weenie-ish,
> unimportant in the larger scheme of things.
> 
> When developing with others, I would like to be able to work in this
> way, tidily keeping my stuff tucked away in my SCM system, and then
> when I am ready to share, to convey to my peers what they need to
> know about my work, and not the 10,000 weenie commit messages that
> may be associated with my work.
> 
> 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?

I tend to do something vaguely like:

	git checkout -b dirtywork origin

Then make a bunch of commits as you describe above--poorly commented, not necessarily logically split up, etc.--then when it's ready,

	git checkout -b cleanwork origin
	git diff cleanwork..dirtywork

Examine the diff, figure out which change should go logically first, apply that one change and commit, and then again run

	git diff cleanwork..dirtywork

Repeat until the diff is empty (except maybe for a few improvements I noticed as I went along). Then finally

	git push publicrepo cleanwork:master
	git branch -D dirtywork

Or something like that.

--b.