From mboxrd@z Thu Jan 1 00:00:00 1970 From: "David J. Mellor" Subject: [PATCH 1/3] Documentation: minor grammatical fixes. Date: Sun, 1 Mar 2009 22:37:41 -0800 Message-ID: <20090302163415.563D217A49@sandstone.whistlingcat.com> Cc: git@vger.kernel.org To: gitster@pobox.com X-From: git-owner@vger.kernel.org Mon Mar 02 17:36:06 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1LeB7S-0007fs-5R for gcvg-git-2@gmane.org; Mon, 02 Mar 2009 17:35:54 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754738AbZCBQeV (ORCPT ); Mon, 2 Mar 2009 11:34:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758566AbZCBQeV (ORCPT ); Mon, 2 Mar 2009 11:34:21 -0500 Received: from quartz.whistlingcat.com ([67.223.228.111]:55460 "EHLO quartz.whistlingcat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754591AbZCBQeU (ORCPT ); Mon, 2 Mar 2009 11:34:20 -0500 Received: from whistlingcat.com (whistlingcat.com [99.12.234.57]) by quartz.whistlingcat.com (Postfix) with ESMTP id 06723488006; Mon, 2 Mar 2009 08:34:16 -0800 (PST) Received: from sandstone.whistlingcat.com (sandstone.whistlingcat.com [192.168.0.2]) by whistlingcat.com (Postfix) with ESMTP id 95F7538E74F0; Mon, 2 Mar 2009 08:34:15 -0800 (PST) Received: by sandstone.whistlingcat.com (Postfix, from userid 500) id 563D217A49; Mon, 2 Mar 2009 08:34:15 -0800 (PST) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: David J. Mellor --- Documentation/git-am.txt | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index ff307eb..1e71dd5 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -27,8 +27,8 @@ OPTIONS ------- |...:: The list of mailbox files to read patches from. If you do not - supply this argument, reads from the standard input. If you supply - directories, they'll be treated as Maildirs. + supply this argument, the command reads from the standard input. + If you supply directories, they will be treated as Maildirs. -s:: --signoff:: @@ -48,7 +48,7 @@ OPTIONS preferred encoding if it is not UTF-8). + This was optional in prior versions of git, but now it is the -default. You could use `--no-utf8` to override this. +default. You can use `--no-utf8` to override this. --no-utf8:: Pass `-n` flag to 'git-mailinfo' (see @@ -57,8 +57,8 @@ default. You could use `--no-utf8` to override this. -3:: --3way:: When the patch does not apply cleanly, fall back on - 3-way merge, if the patch records the identity of blobs - it is supposed to apply to, and we have those blobs + 3-way merge if the patch records the identity of blobs + it is supposed to apply to and we have those blobs available locally. --whitespace=