From: Alexander Potashev Date: Tue, 9 Dec 2008 17:26:22 +0000 (+0300) Subject: Fix typos in documentation X-Git-Tag: v1.6.1-rc3~13 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=51ea440637bca30392dded5a75e23f382ce2f23a;p=git.git Fix typos in documentation Signed-off-by: Alexander Potashev Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index acf8bf41d..12788667d 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -46,7 +46,7 @@ The --cc option must be repeated for each user you want on the cc list. Use $GIT_EDITOR, core.editor, $VISUAL, or $EDITOR to edit an introductory message for the patch series. + -When compose is in used, git send-email gets less interactive will use the +When '--compose' is used, git send-email gets less interactive will use the values of the headers you set there. If the body of the email (what you type after the headers and a blank line) only contains blank (or GIT: prefixed) lines, the summary won't be sent, but git-send-email will still use the diff --git a/Documentation/technical/racy-git.txt b/Documentation/technical/racy-git.txt index 6bdf034b3..48bb97f0b 100644 --- a/Documentation/technical/racy-git.txt +++ b/Documentation/technical/racy-git.txt @@ -135,7 +135,7 @@ them, and give the same timestamp to the index file: This will make all index entries racily clean. The linux-2.6 project, for example, there are over 20,000 files in the working -tree. On my Athron 64X2 3800+, after the above: +tree. On my Athlon 64 X2 3800+, after the above: $ /usr/bin/time git diff-files 1.68user 0.54system 0:02.22elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k