Re: [PATCH 22/32] checkout: support checking out into a new working directory

2014-09-08 Thread Marc Branchaud
On 14-09-08 06:52 AM, Duy Nguyen wrote: > > While we're changing the terms, I wonder if "primary working > directory" and "secondary working directories" are better than "main > checkout" and "linked checkout". I might have a slight preference for main/linked, because primary/secondary can imply

Re: [PATCH 22/32] checkout: support checking out into a new working directory

2014-09-08 Thread Duy Nguyen
On Wed, Sep 3, 2014 at 12:33 AM, Junio C Hamano wrote: > Marc Branchaud writes: > >> On 14-09-02 08:27 AM, Duy Nguyen wrote: >>> After reading this "multiple checkout mode" in git-checkout.txt, I'm >>> tempted to rewrite it like this. I think the example makes it clearer >>> what I mean. If nobod

Re: [PATCH 22/32] checkout: support checking out into a new working directory

2014-09-05 Thread Duy Nguyen
On Fri, Sep 5, 2014 at 10:26 AM, Scott Schmit wrote: >> Each linked working tree has a private sub-directory in the repository's >> $GIT_DIR/worktrees directory. The private sub-directory's name is usually >> the base name of the linked working tree's path, possibly appended with a >> number to m

Re: [PATCH 22/32] checkout: support checking out into a new working directory

2014-09-04 Thread Scott Schmit
On Tue, Sep 02, 2014 at 10:51:47AM -0400, Marc Branchaud wrote: > MULTIPLE WORKING TREES > -- > > A git repository can support multiple working trees, allowing you to check > out more than one branch at a time. With `git checkout --to` a new working > tree is associated with t

Re: [PATCH 22/32] checkout: support checking out into a new working directory

2014-09-04 Thread Duy Nguyen
On Wed, Sep 3, 2014 at 12:33 AM, Junio C Hamano wrote: > Marc Branchaud writes: > >> On 14-09-02 08:27 AM, Duy Nguyen wrote: >>> After reading this "multiple checkout mode" in git-checkout.txt, I'm >>> tempted to rewrite it like this. I think the example makes it clearer >>> what I mean. If nobod

Re: [PATCH 22/32] checkout: support checking out into a new working directory

2014-09-02 Thread Junio C Hamano
Marc Branchaud writes: > On 14-09-02 08:27 AM, Duy Nguyen wrote: >> After reading this "multiple checkout mode" in git-checkout.txt, I'm >> tempted to rewrite it like this. I think the example makes it clearer >> what I mean. If nobody has any comments, I'm going to send v2 with >> this (and othe

Re: [PATCH 22/32] checkout: support checking out into a new working directory

2014-09-02 Thread Marc Branchaud
On 14-09-02 08:27 AM, Duy Nguyen wrote: > After reading this "multiple checkout mode" in git-checkout.txt, I'm > tempted to rewrite it like this. I think the example makes it clearer > what I mean. If nobody has any comments, I'm going to send v2 with > this (and other comments collected so far) O

Re: [PATCH 22/32] checkout: support checking out into a new working directory

2014-09-02 Thread Duy Nguyen
After reading this "multiple checkout mode" in git-checkout.txt, I'm tempted to rewrite it like this. I think the example makes it clearer what I mean. If nobody has any comments, I'm going to send v2 with this (and other comments collected so far) MULTIPLE CHECKOUT MODE -- Nor

Re: [PATCH 22/32] checkout: support checking out into a new working directory

2014-08-31 Thread Philip Oakley
From: "Duy Nguyen" On Sun, Aug 31, 2014 at 11:49 AM, Duy Nguyen wrote: All checkouts share the same repository. Linked checkouts see the repository a bit different from the main checkout. When you perform the command git checkout --to The checkout at will have a

Re: [PATCH 22/32] checkout: support checking out into a new working directory

2014-08-30 Thread Duy Nguyen
On Sun, Aug 31, 2014 at 11:49 AM, Duy Nguyen wrote: > All checkouts share the same repository. Linked checkouts see the > repository a bit different from the main checkout. When you perform > the command > > > git checkout --to > > > The checkout at will have a unique

Re: [PATCH 22/32] checkout: support checking out into a new working directory

2014-08-30 Thread Duy Nguyen
On Sun, Aug 31, 2014 at 3:50 AM, Philip Oakley wrote: >> @@ -225,6 +225,13 @@ This means that you can use `git checkout -p` to >> selectively discard >> edits from your current working tree. See the ``Interactive Mode'' >> section of linkgit:git-add[1] to learn how to operate the `--patch` mode. >

Re: [PATCH 22/32] checkout: support checking out into a new working directory

2014-08-30 Thread Philip Oakley
From: "Nguyễn Thái Ngọc Duy" "git checkout --to" sets up a new working directory with a .git file pointing to $GIT_DIR/repos/. It then executes "git checkout" again on the new worktree with the same arguments except "--to" is taken out. The second checkout execution, which is not contaminated wi

[PATCH 22/32] checkout: support checking out into a new working directory

2014-08-30 Thread Nguyễn Thái Ngọc Duy
"git checkout --to" sets up a new working directory with a .git file pointing to $GIT_DIR/repos/. It then executes "git checkout" again on the new worktree with the same arguments except "--to" is taken out. The second checkout execution, which is not contaminated with any info from the current rep