LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: Carl Worth <cworth@cworth.org>
Cc: git@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [Announce] GIT v1.5.0-rc2
Date: Mon, 22 Jan 2007 11:28:32 -0800 [thread overview]
Message-ID: <7vd556uahr.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <87lkjvhr2c.wl%cworth@cworth.org> (Carl Worth's message of "Mon, 22 Jan 2007 10:08:59 -0800")
Thanks for your comments; the attached probably needs
proofreading.
The changes in response to the remainder of your comments are
quite straightforward and I do not think needs proofreading, so
I'll incorporate them and push the result out in 'todo'.
diff --git a/v1.5.0.txt b/v1.5.0.txt
index c0ff071..596bfd2 100644
--- a/v1.5.0.txt
+++ b/v1.5.0.txt
@@ -107,11 +107,40 @@ Updates in v1.5.0 since v1.4.4 series
already comfortable with your workflow with the layout.
- git-clone always uses what is known as "separate remote"
- layout for a newly created repository with a working tree;
- i.e. tracking branches in $GIT_DIR/refs/remotes/origin/ are
- used to track branches from the origin, instead of
- $GIT_DIR/refs/heads/, making the difference between remotely
- tracked and local branches more obvious.
+ layout for a newly created repository with a working tree.
+
+ A repository with the separate remote layout starts with only
+ one default branch, 'master', to be used for your own
+ development. Unlike the traditional layout that copied all
+ the upstream branches into your branch namespace (while
+ renaming their 'master' to your 'origin'), they are not made
+ into your branches. Instead, they are kept track of using
+ 'refs/remotes/origin/$upstream_branch_name'.
+
+ This layout keeps your own branch namespace less cluttered,
+ avoids name collision with your upstream, makes it possible
+ to automatically track new branches created at the remote
+ after you clone from it, and makes it easier to interact with
+ more than one remote repositories. There might be some
+ surprises:
+
+ * 'git branch' does not show the branches from your upstream.
+ It only lists your own branches. Use '-r' option to view
+ the tracking branches.
+
+ * If you are forking off of a branch obtained from the
+ upstream, you would have done something like 'git branch
+ my-next next', because traditional layout dropped the
+ tracking branch 'next' into your own branch namespace.
+ With the separate remote layout, you say 'git branch next
+ origin/next', which allows you to use the matching name
+ 'next' for your own branch. It also allows you to track a
+ remote other than 'origin' (i.e. where you initially cloned
+ from) and fork off of a branch from there the same way
+ (e.g. "git branch mingw j6t/master").
+
+ Repositories initialized with the traditional layout
+ continues to work (and will continue to work).
- New branches that appear on the origin side after a clone is
made are also tracked automatically. This is done with an
next prev parent reply other threads:[~2007-01-22 19:28 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-21 8:56 Junio C Hamano
2007-01-21 11:20 ` Junio C Hamano
2007-01-21 13:42 ` Bill Lear
2007-01-21 13:52 ` Bill Lear
2007-01-21 21:26 ` Johannes Schindelin
2007-01-21 21:33 ` Jakub Narebski
2007-01-21 22:01 ` Johannes Schindelin
2007-01-21 22:24 ` Jakub Narebski
2007-01-21 13:43 ` Willy Tarreau
2007-01-21 15:06 ` Jakub Narebski
2007-01-21 18:58 ` Junio C Hamano
2007-01-21 19:49 ` H. Peter Anvin
2007-01-22 17:23 ` Nicolas Pitre
2007-01-21 20:01 ` Horst H. von Brand
2007-01-22 1:27 ` Junio C Hamano
2007-01-21 19:46 ` Horst H. von Brand
2007-01-21 21:55 ` Johannes Schindelin
2007-01-21 22:45 ` Jakub Narebski
2007-01-22 18:08 ` Carl Worth
2007-01-22 19:28 ` Junio C Hamano [this message]
2007-01-23 1:01 ` Carl Worth
2007-01-22 18:22 ` Jakub Narebski
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=7vd556uahr.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=cworth@cworth.org \
--cc=git@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--subject='Re: [Announce] GIT v1.5.0-rc2' \
/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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).