From: merlyn@stonehenge.com (Randal L. Schwartz)
To: Linus Torvalds <torvalds@osdl.org>
Cc: walt <wa1ter@myrealbox.com>, git@vger.kernel.org
Subject: Re: My first git success
Date: 13 Jan 2006 10:57:04 -0800 [thread overview]
Message-ID: <86y81kvtvj.fsf@blue.stonehenge.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0601130909290.3535@g5.osdl.org>
>>>>> "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?
--
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!
next prev parent reply other threads:[~2006-01-13 18:57 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-13 14:51 My first git success walt
2006-01-13 17:11 ` Linus Torvalds
2006-01-13 18:57 ` Randal L. Schwartz [this message]
2006-01-13 19:37 ` Junio C Hamano
2006-01-13 20:14 ` Peter Eriksen
2006-01-14 15:39 ` My first git success [not quite] walt
2006-01-14 15:55 ` sean
2006-01-14 15:55 ` sean
2006-01-14 17:18 ` walt
2006-01-14 17:48 ` Randal L. Schwartz
2006-01-14 20:31 ` Junio C Hamano
2006-01-14 19:25 ` Linus Torvalds
2006-01-14 20:41 ` walt
2006-01-14 20:49 ` Junio C Hamano
2006-01-14 21:57 ` Linus Torvalds
2006-01-15 10:44 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86y81kvtvj.fsf@blue.stonehenge.com \
--to=merlyn@stonehenge.com \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.org \
--cc=wa1ter@myrealbox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.