From: Junio C Hamano <gitster@pobox•com>
To: Thomas Ackermann <th.acker@arcor•de>
Cc: git@vger•kernel.org, wking@tremily•us
Subject: Re: [PATCH 06/13] Simplify "How to make a commit"
Date: Sat, 24 Aug 2013 20:20:50 -0700 [thread overview]
Message-ID: <xmqqr4dimp65.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1687455733.1090999.1377329376866.JavaMail.ngmail@webmail08.arcor-online.net> (Thomas Ackermann's message of "Sat, 24 Aug 2013 09:29:36 +0200 (CEST)")
Thomas Ackermann <th.acker@arcor•de> writes:
> Combine the two cases for "git add" into one.
> Add verb "use" to "git rm" case.
>
> Signed-off-by: Thomas Ackermann <th.acker@arcor•de>
> ---
> Documentation/user-manual.txt | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
> index 8a1a441..ca78333 100644
> --- a/Documentation/user-manual.txt
> +++ b/Documentation/user-manual.txt
> @@ -1080,19 +1080,14 @@ produce no output at that point.
>
> Modifying the index is easy:
>
> -To update the index with the new contents of a modified file, use
> +To add the contents of a new file to the index or update the index
> +with the new contents of a modified file, use
>
> -------------------------------------------------
> $ git add path/to/file
> -------------------------------------------------
>
> -To add the contents of a new file to the index, use
> -
> --------------------------------------------------
> -$ git add path/to/file
> --------------------------------------------------
OK.
> -To remove a file from the index and from the working tree,
> +To remove a file from the index and from the working tree, use
>
> -------------------------------------------------
> $ git rm path/to/file
next prev parent reply other threads:[~2013-08-25 3:20 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-24 7:22 [PATCH 0/13] Modernize user-manual Thomas Ackermann
2013-08-24 7:24 ` [PATCH 01/13] Call it "Git User Manual" and remove reference to very old Git version Thomas Ackermann
2013-08-25 3:05 ` Jonathan Nieder
2013-08-25 3:07 ` Junio C Hamano
2013-08-24 7:25 ` [PATCH 02/13] Use current "detached HEAD" message Thomas Ackermann
2013-08-25 3:49 ` Jonathan Nieder
2013-08-25 8:10 ` Aw: " Thomas Ackermann
2013-08-24 7:26 ` [PATCH 03/13] Use current output for "git repack" Thomas Ackermann
2013-08-25 4:15 ` Jonathan Nieder
2013-08-25 8:37 ` Aw: " Thomas Ackermann
2013-08-24 7:27 ` [PATCH 04/13] Use "git merge" instead of "git pull ." Thomas Ackermann
2013-08-25 3:17 ` Junio C Hamano
2013-08-25 4:19 ` Jonathan Nieder
2013-08-25 5:26 ` Martin von Zweigbergk
2013-08-24 7:28 ` [PATCH 05/13] Fix some typos Thomas Ackermann
2013-08-25 5:01 ` Jonathan Nieder
2013-08-25 9:13 ` Aw: " Thomas Ackermann
2013-08-24 7:29 ` [PATCH 06/13] Simplify "How to make a commit" Thomas Ackermann
2013-08-25 3:20 ` Junio C Hamano [this message]
2013-08-25 5:05 ` Jonathan Nieder
2013-08-25 9:20 ` Aw: " Thomas Ackermann
2013-08-24 7:30 ` [PATCH 07/13] Improve description in "How to merge" Thomas Ackermann
2013-08-25 3:22 ` Junio C Hamano
2013-08-25 5:08 ` Jonathan Nieder
2013-08-25 11:31 ` Aw: " Thomas Ackermann
2013-08-24 7:31 ` [PATCH 08/13] Improve section "Manipulating branches" Thomas Ackermann
2013-08-25 3:25 ` Junio C Hamano
2013-08-25 11:41 ` Aw: " Thomas Ackermann
2013-08-24 7:32 ` [PATCH 09/13] Improve section "Merge multiple trees" Thomas Ackermann
2013-08-25 5:23 ` Jonathan Nieder
2013-08-25 12:06 ` Aw: " Thomas Ackermann
2013-08-25 20:10 ` Jonathan Nieder
2013-08-24 7:33 ` [PATCH 10/13] Remove unnecessary historical note from "Object storage format" Thomas Ackermann
2013-08-25 3:28 ` Junio C Hamano
2013-08-24 7:34 ` [PATCH 11/13] Remove obscure reference from "Examples" Thomas Ackermann
2013-08-25 3:53 ` Junio C Hamano
2013-08-25 5:25 ` Jonathan Nieder
2013-08-25 9:30 ` Aw: " Thomas Ackermann
2013-08-24 7:35 ` [PATCH 12/13] Remove irrelevant reference from "Tying it all together" Thomas Ackermann
2013-08-25 3:56 ` Junio C Hamano
2013-08-26 13:51 ` Jon Loeliger
2013-08-24 7:37 ` [PATCH 13/13] "git prune" is safe now Thomas Ackermann
2013-08-25 3:59 ` Junio C Hamano
2013-08-24 19:31 ` [PATCH 0/13] Modernize user-manual Philip Oakley
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=xmqqr4dimp65.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=th.acker@arcor$(echo .)de \
--cc=wking@tremily$(echo .)us \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox