From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.176.0/21 X-Spam-Status: No, score=-3.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 From: Chris Riddoch Subject: [PATCH] Move --pretty options into Documentation/pretty-formats.txt Date: Tue, 21 Nov 2006 16:49:15 -0700 Message-ID: <11641529553903-git-send-email-chris@syntacticsugar.org> NNTP-Posting-Date: Tue, 21 Nov 2006 23:53:03 +0000 (UTC) Cc: Chris Riddoch Return-path: Envelope-to: gcvg-git@gmane.org X-Mailer: git-send-email 1.4.4 Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1GmfPt-0002gB-3q for gcvg-git@gmane.org; Wed, 22 Nov 2006 00:52:42 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031308AbWKUXwa (ORCPT ); Tue, 21 Nov 2006 18:52:30 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1031362AbWKUXwa (ORCPT ); Tue, 21 Nov 2006 18:52:30 -0500 Received: from hinegardner.org ([216.17.180.14]:65098 "EHLO planchet.hinegardner.org") by vger.kernel.org with ESMTP id S1031299AbWKUXw3 (ORCPT ); Tue, 21 Nov 2006 18:52:29 -0500 Received: from localhost.localdomain (localhost [127.0.0.1]) by planchet.hinegardner.org (Postfix) with ESMTP id 8E63E1599EE7; Tue, 21 Nov 2006 16:53:07 -0700 (MST) To: git@vger.kernel.org Sender: git-owner@vger.kernel.org Asciidoc-include it into the manuals for programs that use the --pretty command-line option, for consistency among the docs. This describes all the pretty-formats currently listed in the cmit_fmt enum in commit.h, and also briefly describes the presence and format of the 'Merge: ' line in some pretty formats. There's a hedge that limiting your view of history can affect what goes in the Merge: line, and that --abbrev/--no-abbrev do nothing to the 'raw' format. Signed-off-by: Chris Riddoch --- Documentation/git-diff-tree.txt | 5 +-- Documentation/git-log.txt | 4 +- Documentation/git-rev-list.txt | 6 +--- Documentation/git-show.txt | 5 +-- Documentation/pretty-formats.txt | 60 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 65 insertions(+), 15 deletions(-) diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index f7e8ff2..5d6e9dc 100644 --- a/Documentation/git-diff-tree.txt +++ b/Documentation/git-diff-tree.txt @@ -73,10 +73,7 @@ separated with a single space are given. This flag causes "git-diff-tree --stdin" to also show the commit message before the differences. ---pretty[=(raw|medium|short)]:: - This is used to control "pretty printing" format of the - commit message. Without "=