[SCM] zita-convolver packaging branch, master, updated. debian/1.0.0-2-14-g2f3799f

[Felipe Sateler]

On Wed, 2009-12-02 at 14:50 +0100, Jaromír Mikeš wrote:
> > Od: Felipe Sateler <fsateler at gmail.com>
> 
> > ----------------------------------------
> JM> On Wed, 2009-12-02 at 02:40 +0000, mira-guest at users.alioth.debian.org
> JM> wrote:
> JM> > The following commit has been merged in the master branch:
> JM> > commit be884194e2d5262f3cf76d6394ae31ae7e2cfb98
> JM> > Author: Jaromír Mikeš <mira.mikes at seznam.cz>
> JM> > Date:   Wed Dec 2 03:29:45 2009 +0100
> JM> >     Edited control file
> 
> FS> Please use more meaningful commit messages. The idea of commit messages
> FS> is to note what is not obvious with a simple diff (and friends). 
> 
> FS> In this particular case, you mixed the updating of standards-version,
> FS> soname change in the library, and descriptions. While it is not really
> FS> difficult to discern (in this commit) what happened, it is better to
> FS> look at one change at a time. Please do that when you keep updating your
> FS> packages.
> 
> Hi,
> 
> I understand you request...
> my usual work-flow for upgrading source is :
> - get build package again
> - get package lintian clean again
> - than make commits for all changed files
> this avoid me from from too many commits if I do something wrong. 
> And I usually do ;)

If you do a lot of commits (including undoing stuff), you can then clean
up the repository with git rebase (before pushing). If the alioth remote
is called origin:

git rebase -i origin/master

This will bring an editor that contains all the commits made since your
last pull, prefixed with "pick". You can then reorder the commits, by
swapping lines. And you can merge commits with the previous one by
changing the "pick" prefix by "squash".

> Too many commit ( do something undo something) in git repo make repo ugly IMO.
> 
> Is there way to split commits for multi-edited file?

Yes, but it is somewhat complicated. See the man page of git-rebase,
section "splitting commits".


-- 
Saludos,
Felipe Sateler
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20091202/83665a63/attachment.pgp>