Digression on git; how I'll reduce minor commits

[Teika Kazura]

Hi. The last push of my branch included a few minor doc commits, but
they can be combined to others, so I should have do so in order to
reduce commits, but I didn't know how to do it. Let me explain how
I'll do better next time.

A commit should be a unit of "good changes". In another words, patches
grouped together by their roles form a commit. My main job now is to
rewrite news.texi, but it's gradual. By nature, all can be squeezed
into a sole commit in the above sense. (But it's good to push from
time to time so that people can read it and see what's going on. A
commit per a week or two is moderate.)

Last time I made many commits, because git doesn't like much
uncommitted changes being around; merge, cherry-pick, etc. I edit my
local branch, but at the same time I play around with upstream and my
other branches.  But git-stash can easily clutter things, and I don't
like it. So commits.

I come up with a new recipe:
$ git checkout -b continuos-edit  # branch dedicated to continuous edits
$                  # write doc. Oh, new arrival.
$ git commit -a    # I don't hesitate to commit on this branch,
$                  # instead of stash
$ git merge master # what's new?
$                  # think, copy edit, ask at ML, copy read ...
$                  # when ready to publish
$ git merge master # make sure it's up-to-date
$ git commit -a    # now, let's go to outside world!
$ git checkout branch-to-push
$ git diff master..continuos-edit | git apply
$ git commit -a -v
Seems not bad for me. Does anyone know better way?

Thank you for reading. Regards,
Teika (Teika kazura)

[Alexey I. Froloff-4]

On Tue, Oct 27, 2009 at 05:35:12PM +0900, Teika Kazura wrote:
> $ git diff master..continuos-edit | git apply
> $ git commit -a -v
> Seems not bad for me. Does anyone know better way?
Have you tried commit --amend?

--
Regards,
Sir Raorn.

[Teika Kazura]

On Wed, 28 Oct 2009 00:41:57 +0300, "Alexey I. Froloff" wrote:
> On Tue, Oct 27, 2009 at 05:35:12PM +0900, Teika Kazura wrote:
>> $ git diff master..continuos-edit | git apply
>> $ git commit -a -v
>> Seems not bad for me. Does anyone know better way?
> Have you tried commit --amend?

commit --amend is handy, but you need to be careful. I've shot my feet
twice by --amend; once is right after merge. (Try it and you'll see
what happens ;) I forgot the other.

Thanks anyway.

By the way, 99% of Japanese don't know Malevitch's Black Square, so
please avoid this kind of expression in bugzilla. (I know Lenin's
mausoleum was designed by Malevitch or at least strongly influenced
by him. :)

Poka, Alyosha
Teika (Teika kazura)