[alsa-devel] git workflow for casual developers

[Takashi Iwai]

At Thu, 05 Jun 2008 16:57:22 +1200,
Eliot Blennerhassett wrote:
> 
> 1) git-config --add user.email me at domain.com
> Otherwise commits get spurious email address for Author and Commiter (is there 
> any way to fix this after the fact?)

You need to re-commit the patch.  For editing the tip commit log, you
can use "git-commit --amend".

> 2) should I create a branch in my cloned repo for my changes, or just go ahead 
> and commit?
> (I didn't create a branch)

It's totally up to you.  I prefer creating a patch or work on another
tree to avoid unnecessary breakage via git-pull, though.

> 3)  How do I generate patches for my changes to the repo?
> Luckily for me there was a tag that was close enough so I could
> git-diff v1.0.17rc1
> 
> Should I really have used this as the "revision"?
> git-diff remotes/origin/master

Before submitting to the upstream, try to rebase to the latest
upstream version.  In my case, a typical workflow is like below:

	# suppose that we are working on master branch

	# fetch from the upstream
	% git-fetch origin

	# save the current branch
	% git-branch save

	# rebase to the latest upstream
	% git-rebase origin/master

	# if you got an error and want to rollback to the old tree...
	% git-reset --hard save

	# if no error and it's fine, remove the saved branch
	% git-branch -D save


Takashi