From: Peter Eriksen <s022018@student.dtu.dk>
Date: Fri, 13 Jan 2006 20:14:21 GMT
Subject: Re: My first git success
Message-ID: <20060113201421.GA25252@ebar091.ebar.dtu.dk>
In-Reply-To: <86y81kvtvj.fsf@blue.stonehenge.com>

On Fri, Jan 13, 2006 at 10:57:04AM -0800, Randal L. Schwartz wrote:
> >>>>> "Linus" == Linus Torvalds <torvalds@osdl.org> writes:
> 
> Linus> I still hope the exchanges will result in more docs, or at least other 
> Linus> lurkers on the list also learning a new trick or two..
> 
> I've also enjoyed a bit of success putting a website under git.  I started
> working on AJAX-ing some of the code, but I needed to do maintainence on the
> live site, so I've just simply done "git-checkout master" to work on that, and
> "git-checkout ajax; git-pull . master" when I want to continue work on the
> ajax upgrades.
> 
> However, before I bug-fix, I have to "snapshot" any working changes in the
> ajax branch or I would lose them on "git-checkout master", which gives me
> commits that look like "snapshot".  Am I doing that wrong?  Is there a better
> way to do parallel development of a "live vs upgrade" branch, and make commits
> only when I make progress?

I've been wondering this myself.  Perhaps the following way would work?

    git checkout ajax          # Work on the ajax branch.
    git diff HEAD >ajaxdiff
    git checkout -f master     # Work on the bug fix in master.
    git commit -a -m "Bug fix in master"
    git checkout ajax
    git apply ajaxdiff
    git commit -a -m "Finished commit in ajax"

This is untested, so it's only for inspiration.

Regards,

Peter