From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Xavier Maillard <xma@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: Git repository and branches ?
Date: Sat, 23 Feb 2008 03:00:06 +0100
Organization: GNU's Not UNIX!
Message-ID: <200802230200.m1N206aV007398@localhost.localdomain>
References: <200802210200.m1L20CP8004750@localhost.localdomain>
	<87wsoz9j1b.fsf@catnip.gol.com>
	<200802220200.m1M207el003444@localhost.localdomain>
	<buove4hitj2.fsf@dhapc248.dev.necel.com>
Reply-To: Xavier Maillard <xma@gnu.org>
NNTP-Posting-Host: lo.gmane.org
X-Trace: ger.gmane.org 1203734211 17079 80.91.229.12 (23 Feb 2008 02:36:51 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Sat, 23 Feb 2008 02:36:51 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Miles Bader <miles@gnu.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Feb 23 03:37:16 2008
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Envelope-to: ged-emacs-devel@m.gmane.org
Original-Received: from lists.gnu.org ([199.232.76.165])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1JSkGE-0004MM-05
	for ged-emacs-devel@m.gmane.org; Sat, 23 Feb 2008 03:37:10 +0100
Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1JSkFi-0004gy-Hs
	for ged-emacs-devel@m.gmane.org; Fri, 22 Feb 2008 21:36:38 -0500
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JSkD7-0002M0-Gg
	for emacs-devel@gnu.org; Fri, 22 Feb 2008 21:33:57 -0500
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JSkD6-0002Kw-6p
	for emacs-devel@gnu.org; Fri, 22 Feb 2008 21:33:56 -0500
Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JSkD5-0002Kq-L6
	for emacs-devel@gnu.org; Fri, 22 Feb 2008 21:33:55 -0500
Original-Received: from master.uucpssh.org ([193.218.105.66])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <xma@gnu.org>)
	id 1JSkD1-00031G-Ja; Fri, 22 Feb 2008 21:33:51 -0500
Original-Received: by master.uucpssh.org (Postfix, from userid 10)
	id 61831C8391; Sat, 23 Feb 2008 03:32:24 +0100 (CET)
Original-Received: from localhost.localdomain (IDENT:1000@localhost [127.0.0.1])
	by localhost.localdomain (8.14.1/8.13.8) with ESMTP id m1N20Fhc007418; 
	Sat, 23 Feb 2008 03:00:15 +0100
Original-Received: (from xma@localhost)
	by localhost.localdomain (8.14.1/8.13.8/Submit) id m1N206aV007398;
	Sat, 23 Feb 2008 03:00:06 +0100
In-reply-to: <buove4hitj2.fsf@dhapc248.dev.necel.com> (message from Miles
	Bader on Fri, 22 Feb 2008 12:01:21 +0900)
User-Agent: Rmail in GNU Emacs 23.0.60.2 on GNU/Linux
Jabber-ID: xma01@jabber.fr
X-uucpssh: Found to be clean
X-uucpssh-SpamCheck: not spam, SpamAssassin (not cached, score=-4.359,
	required 4.6, autolearn=not spam, ALL_TRUSTED -1.80, AWL 0.04,
	BAYES_00 -2.60, SPF_HELO_PASS -0.00)
X-uucpssh-From: xma@gnu.org
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3)
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:90088
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/90088>


   Xavier Maillard <xma@gnu.org> writes:
   >       git checkout -b lexbind origin/lexbind
   >
   >    [After that, you can switch to your local lexbind branch by just
   >    using "git checkout lexbind"; to switch back to the trunk, use
   >    "git checkout master".]
   >
   > Will my local git repository be able to "track" the activity of
   > the branch I am working. In short, will git-pull also fetch
   > branches?

   That command should set up a "tracking branch" by default (I just
   checked, and indeed --track is now the default; it didn't use to be,
   though, so be aware if you have an old version of git), which means
   that "git pull" will fetch and merge the current branch.

   [I'm a bit fuzzy on what exactly gets _fetched_ by default -- whether
   all branches from the origin remote, or only the origin branch
   corresponding to the current branch -- but I know only the current
   branch will be _merged_ when you do "git pull" or "git merge".  So
   after using "git checkout BRANCH" to switch to a new branch, it's a
   good idea to use "git pull" again to make sure it's up to date.]

Once again, thank you very much for your help. I tested it here
and it worked like a charm. The only drawback is that switching
from a branch to master and vice versa takes very long...

I can live with that though.

	Xavier
-- 
http://www.gnu.org
http://www.april.org
http://www.lolica.org