From: Takashi Iwai Subject: Re: git workflow for casual developers Date: Fri, 06 Jun 2008 12:51:08 +0200 Message-ID: References: <200806051657.22205.linux@audioscience.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (ns2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 1293024366 for ; Fri, 6 Jun 2008 12:51:11 +0200 (CEST) In-Reply-To: <200806051657.22205.linux@audioscience.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: Eliot Blennerhassett Cc: alsa-devel@alsa-project.org List-Id: alsa-devel@alsa-project.org At Thu, 05 Jun 2008 16:57:22 +1200, Eliot Blennerhassett wrote: > > 1) git-config --add user.email me@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