From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthieu Moy Subject: [PATCH v3 2/2] Documentation/git-am.txt: mention mailinfo.scissors config variable Date: Fri, 20 Feb 2015 20:32:21 +0100 Message-ID: <1424460741-25533-2-git-send-email-Matthieu.Moy@imag.fr> References: <1424426947-26441-1-git-send-email-Matthieu.Moy@imag.fr> <1424460741-25533-1-git-send-email-Matthieu.Moy@imag.fr> Cc: git@vger.kernel.org, Jeff King , Matthieu Moy To: gitster@pobox.com X-From: git-owner@vger.kernel.org Fri Feb 20 20:32:42 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YOtJZ-0001zO-J7 for gcvg-git-2@plane.gmane.org; Fri, 20 Feb 2015 20:32:41 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754762AbbBTTch (ORCPT ); Fri, 20 Feb 2015 14:32:37 -0500 Received: from mx1.imag.fr ([129.88.30.5]:56685 "EHLO shiva.imag.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754748AbbBTTch (ORCPT ); Fri, 20 Feb 2015 14:32:37 -0500 Received: from clopinette.imag.fr (clopinette.imag.fr [129.88.34.215]) by shiva.imag.fr (8.13.8/8.13.8) with ESMTP id t1KJWOAh022706 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 20 Feb 2015 20:32:24 +0100 Received: from anie.imag.fr (anie.imag.fr [129.88.7.32]) by clopinette.imag.fr (8.13.8/8.13.8) with ESMTP id t1KJWQcO008709; Fri, 20 Feb 2015 20:32:26 +0100 Received: from moy by anie.imag.fr with local (Exim 4.80) (envelope-from ) id 1YOtJK-0006iz-8r; Fri, 20 Feb 2015 20:32:26 +0100 X-Mailer: git-send-email 2.3.0.157.g79e124b In-Reply-To: <1424460741-25533-1-git-send-email-Matthieu.Moy@imag.fr> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0.1 (shiva.imag.fr [129.88.30.5]); Fri, 20 Feb 2015 20:32:24 +0100 (CET) X-IMAG-MailScanner-Information: Please contact MI2S MIM for more information X-MailScanner-ID: t1KJWOAh022706 X-IMAG-MailScanner: Found to be clean X-IMAG-MailScanner-SpamCheck: X-IMAG-MailScanner-From: moy@imag.fr MailScanner-NULL-Check: 1425065548.91674@+r1leXixQvLRHcp3e2yubQ Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: It was already documented, but the user had to follow the link to git-mailinfo.txt to find it. Signed-off-by: Matthieu Moy --- Documentation/git-am.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index f4eea28..0d8ba48 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -52,7 +52,8 @@ OPTIONS -c:: --scissors:: Remove everything in body before a scissors line (see - linkgit:git-mailinfo[1]). + linkgit:git-mailinfo[1]). Can be activated by default using + the `mailinfo.scissors` configuration variable. --no-scissors:: Ignore scissors lines (see linkgit:git-mailinfo[1]). -- 2.3.0.157.g79e124b