Re: [PATCH] Consistent usage of working tree in the git-add help

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Lars Vogel <lars.vogel@xxxxxxxxx> writes:

> The usage of working directory is inconsistent in the git add help.
> Also http://git-scm.com/docs/giit-clone speaks only about working tree.
> Remaining entry found by "git grep -B1 '^directory' git-add.txt" really
> relates to a directory.
>
> Signed-off-by: Lars Vogel <Lars.Vogel@xxxxxxxxxxx>
> ---
>  Documentation/git-add.txt | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
> index fe5282f..cfef77b 100644
> --- a/Documentation/git-add.txt
> +++ b/Documentation/git-add.txt
> @@ -24,7 +24,7 @@ remove paths that do not exist in the working tree anymore.
>  
>  The "index" holds a snapshot of the content of the working tree, and it
>  is this snapshot that is taken as the contents of the next commit.  Thus
> -after making any changes to the working directory, and before running
> +after making any changes to the working tree, and before running
>  the commit command, you must use the `add` command to add any new or
>  modified files to the index.
>  
> @@ -85,7 +85,7 @@ OPTIONS
>  -p::
>  --patch::
>  	Interactively choose hunks of patch between the index and the
> -	work tree and add them to the index. This gives the user a chance
> +	working tree and add them to the index. This gives the user a chance
>  	to review the difference before adding modified contents to the
>  	index.
>  +

Thanks.  While the first hunk looks to me a definite improvement, I
am lukewarm about s/work tree/working tree/ change.  Both terms are
used fairly commonly in our documentation set.  "Work tree" has ~70
hits vs ~350 for "working tree" (ignoring the case where these words
are split across lines, i.e. "work/working" at the end of the line
followed by a line that begins with "tree").
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]