Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Johannes Sixt
Am 12/17/2012 8:21, schrieb Junio C Hamano: Chris Rorvick ch...@rorvick.com writes: 'git checkout' [branch]:: Is branch really optional in this form? BTW, what does plain 'git checkout' do? Just report ahead/behind information? + +Update the index, working tree, and HEAD to reflect the

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Junio C Hamano
Here is what I tentatively have (so that I do not forget) on 'pu', marked with (squash???), as a suggested update on top of Chris's patches. Documentation/git-checkout.txt | 29 + 1 file changed, 21 insertions(+), 8 deletions(-) diff --git

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Andrew Ardill
Regards, Andrew Ardill On 17 December 2012 19:20, Johannes Sixt j.s...@viscovery.net wrote: Am 12/17/2012 8:21, schrieb Junio C Hamano: Chris Rorvick ch...@rorvick.com writes: 'git checkout' [branch]:: Is branch really optional in this form? BTW, what does plain 'git checkout' do? Just

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Johannes Sixt
Am 12/17/2012 9:48, schrieb Junio C Hamano: Here is what I tentatively have ... Thanks! -'git checkout' [--detach] [commit]:: +'git checkout' --detach [commit]:: +'git checkout' commit:: - Update the index and working tree to reflect the specified - commit and set HEAD to point

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Junio C Hamano
Johannes Sixt j.s...@viscovery.net writes: Am 12/17/2012 9:48, schrieb Junio C Hamano: Here is what I tentatively have ... Thanks! -'git checkout' [--detach] [commit]:: +'git checkout' --detach [commit]:: +'git checkout' commit:: -Update the index and working tree to reflect the

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Sent: Monday, December 17, 2012 7:21 AM Chris Rorvick ch...@rorvick.com writes: The forms of checkout that do not take a path are lumped together in the DESCRIPTION section, but the description for this group is dominated by explanation of the -b|-B form.

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: From: Junio C Hamano gits...@pobox.com Sent: Monday, December 17, This is to check out the branch ;-) ... From a user perspective it's better to refer to the working directory first rather than the internal mechanics. Prepare to work on

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Junio C Hamano
Andrew Ardill andrew.ard...@gmail.com writes: Even if the primary purpose of git checkout branch is to check out the branch so that further work is done on that branch, I don't believe that means it has to be stated first. In fact, I would say that there are enough other use cases that the

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Sent: Monday, December 17, 2012 9:13 PM Philip Oakley philipoak...@iee.org writes: From: Junio C Hamano gits...@pobox.com Sent: Monday, December 17, This is to check out the branch ;-) ... From a user perspective it's better to refer to the working

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Andrew Ardill
On 18 December 2012 08:59, Junio C Hamano gits...@pobox.com wrote: Andrew Ardill andrew.ard...@gmail.com writes: Even if the primary purpose of git checkout branch is to check out the branch so that further work is done on that branch, I don't believe that means it has to be stated first. In

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: I agree with you that sightseeing use case where you do not intend to make any commit is also important. That is exactly why I said further work is done on that branch not to that branch in the message you are responding to. Here is a

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Andrew Ardill
I like these, and I think they are conveying the right amount of information. There is a slight discrepancy between the branch and commit versions, where it seems we are assuming that by checking out a commit you are intending to work 'on top of' it. This could be avoided by using the term 'with'

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Chris Rorvick
On Mon, Dec 17, 2012 at 2:20 AM, Johannes Sixt j.s...@viscovery.net wrote: +'git checkout' [--detach] [commit]:: The title here is better spelled as two lines: 'git checkout' commit:: 'git checkout' --detach branch:: AsciiDoc renders these horizontally separated by a comma when formatted as

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-17 Thread Chris Rorvick
On Mon, Dec 17, 2012 at 7:53 PM, Junio C Hamano gits...@pobox.com wrote: Here is a work-in-progress relative to Chris's 83c9989 (Documentation/git-checkout.txt: document 70c9ac2 behavior, 2012-12-17). It sounds pretty good to me. @@ -54,12 +61,17 @@ $ git checkout branch that is to say,

[PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-16 Thread Chris Rorvick
The forms of checkout that do not take a path are lumped together in the DESCRIPTION section, but the description for this group is dominated by explanation of the -b|-B form. Split these apart for more clarity. Signed-off-by: Chris Rorvick ch...@rorvick.com --- Documentation/git-checkout.txt |

Re: [PATCH 1/2] Documentation/git-checkout.txt: clarify usage

2012-12-16 Thread Junio C Hamano
Chris Rorvick ch...@rorvick.com writes: The forms of checkout that do not take a path are lumped together in the DESCRIPTION section, but the description for this group is dominated by explanation of the -b|-B form. Split these apart for more clarity. Signed-off-by: Chris Rorvick