git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 21, 2016, 00:24 UTC
Message-ID
<xmqqr3hb22zu.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<1453229636-16269-1-git-send-email-Lars.Vogel@vogella.com>
Lars Vogel <lars.vogel@gmail.com> writes:
Show 32 quoted lines
> 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@vogella.com>
> ---
>  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").

Previous: Lars VogelNext: Lars Vogel
Message 2 of 3 in “Consistent usage of working tree in the git-add help”
  1. Consistent usage of working tree in the git-add helpLars Vogel, Jan 19, 2016
  2. Junio C HamanoJan 21, 2016
  3. Lars VogelJan 21, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.