From: Tom Prince <tom.prince@ualberta.net>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: GIT 0.99.7d, and end of week status.
Date: Sun, 25 Sep 2005 16:42:58 -0600 [thread overview]
Message-ID: <87psqwzs3x.fsf@ualberta.net> (raw)
In-Reply-To: <7vaci1nfwa.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano <junkio@cox.net> writes:
>
> When you already have a repository to track git.git, I would
> recommend to have something like this in .git/remote/origin:
>
> URL: http://kernel.org/pub/scm/git/git.git
> Pull: master:origin maint:maint +pu:pu
>
A warning when you do this. If you say
git pull origin
then your master will be updated with an octopus merge of the three heads.
Tom
next prev parent reply other threads:[~2005-09-25 22:43 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-25 8:36 GIT 0.99.7d, and end of week status Junio C Hamano
2005-09-25 9:32 ` Alan Chandler
2005-09-25 18:47 ` Junio C Hamano
2005-09-25 20:43 ` Alan Chandler
2005-09-26 0:01 ` Junio C Hamano
2005-09-26 6:09 ` Alan Chandler
2005-09-26 20:23 ` Junio C Hamano
2005-09-25 22:42 ` Tom Prince [this message]
2005-09-25 23:46 ` Junio C Hamano
2005-09-26 19:10 ` Petr Baudis
2005-09-26 20:25 ` Junio C Hamano
2005-09-27 10:17 ` Petr Baudis
2005-09-29 4:40 ` Matthias Urlichs
2005-09-29 5:11 ` Junio C Hamano
2005-09-26 20:17 ` Jon Loeliger
2005-09-26 22:03 ` Junio C Hamano
2005-09-27 7:38 ` [PATCH] Fix default pull not to do an unintended Octopus Junio C Hamano
2005-09-27 9:52 ` Josef Weidendorfer
2005-09-27 12:54 ` Petr Baudis
2005-09-27 14:35 ` Josef Weidendorfer
2005-09-27 22:24 ` Junio C Hamano
2005-09-27 10:13 ` GIT 0.99.7d, and end of week status Petr Baudis
2005-09-27 9:51 ` Petr Baudis
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=87psqwzs3x.fsf@ualberta.net \
--to=tom.prince@ualberta.net \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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.