From: Kevin Wolf <kwolf@redhat.com>
To: Christoph Egger <Christoph.Egger@amd.com>
Cc: Laurent Desnogues <laurent.desnogues@gmail.com>,
"C.W. Betts" <computers57@hotmail.com>,
qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] updating git tree
Date: Tue, 28 Apr 2009 11:32:55 +0200 [thread overview]
Message-ID: <49F6CD47.7080307@redhat.com> (raw)
In-Reply-To: <200904281049.54617.Christoph.Egger@amd.com>
Christoph Egger schrieb:
> On Tuesday 28 April 2009 08:54:56 Laurent Desnogues wrote:
>> On Tue, Apr 28, 2009 at 8:50 AM, C.W. Betts <computers57@hotmail.com> wrote:
>>> I'm feeling lazy and I don't want to look at all the e-mails. How do you
>>> update your git tree?
>> Once you've cloned it (aka checkout), you update your tree using git pull
>> (aka update).
>
> Unlike 'svn update', a 'git pull' doesn't automatically merge local changes.
> git fails instead. git is missing this 'automatic merge on pull' feature.
> If you have local changes, you must do
Why would you have local (and even more, not committed) changes in the
master branch? I always work in branches, commit frequently and rebase
then on the master branch with a clean tree.
Kevin
next prev parent reply other threads:[~2009-04-28 9:34 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-28 6:50 [Qemu-devel] updating git tree C.W. Betts
2009-04-28 6:50 ` C.W. Betts
2009-04-28 6:54 ` Laurent Desnogues
2009-04-28 7:21 ` Bartlomiej Celary
2009-04-28 8:49 ` Christoph Egger
2009-04-28 9:32 ` Kevin Wolf [this message]
2009-04-28 9:38 ` [Qemu-devel] " Jan Kiszka
2009-04-28 9:42 ` Laurent Desnogues
2009-04-28 10:04 ` Kevin Wolf
2009-04-28 10:20 ` Jan Kiszka
2009-04-28 10:28 ` Kevin Wolf
2009-04-28 10:48 ` Jan Kiszka
2009-04-28 10:58 ` Kevin Wolf
2009-04-28 11:14 ` Jan Kiszka
2009-04-28 11:15 ` François Revol
2009-04-28 10:25 ` Gerd Hoffmann
2009-04-28 11:11 ` [Qemu-devel] " François Revol
2009-04-28 12:03 ` Laurent Desnogues
2009-04-28 12:57 ` François Revol
2009-04-28 13:10 ` Laurent Vivier
2009-04-28 13:49 ` François Revol
2009-04-28 13:58 ` Kevin Wolf
2009-04-28 15:10 ` Laurent Vivier
2009-04-28 15:22 ` Kevin Wolf
2009-04-28 15:40 ` Laurent Vivier
2009-04-28 16:51 ` Andreas Färber
2009-04-28 19:25 ` François Revol
2009-04-28 19:49 ` Andreas Färber
2009-04-28 20:17 ` François Revol
2009-04-28 21:01 ` François Revol
2009-04-29 7:54 ` Markus Armbruster
2009-04-29 8:51 ` François Revol
2009-04-29 9:22 ` Markus Armbruster
2009-04-29 9:57 ` François Revol
2009-04-29 7:44 ` Markus Armbruster
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=49F6CD47.7080307@redhat.com \
--to=kwolf@redhat.com \
--cc=Christoph.Egger@amd.com \
--cc=computers57@hotmail.com \
--cc=laurent.desnogues@gmail.com \
--cc=qemu-devel@nongnu.org \
/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.