From mboxrd@z Thu Jan 1 00:00:00 1970 From: Frank Sorenson Subject: [PATCH] cg-log: ignore merges by default, and add --show-merges option Date: Thu, 10 Nov 2005 14:03:10 -0700 Message-ID: <4373B58E.6030606@tuxrocks.com> References: <4373B1A6.8000706@tuxrocks.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-From: git-owner@vger.kernel.org Thu Nov 10 22:05:47 2005 Return-path: Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EaJZo-0003I3-Aj for gcvg-git@gmane.org; Thu, 10 Nov 2005 22:03:20 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932117AbVKJVDR (ORCPT ); Thu, 10 Nov 2005 16:03:17 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932118AbVKJVDR (ORCPT ); Thu, 10 Nov 2005 16:03:17 -0500 Received: from www.tuxrocks.com ([64.62.190.123]:24333 "EHLO tuxrocks.com") by vger.kernel.org with ESMTP id S932117AbVKJVDQ (ORCPT ); Thu, 10 Nov 2005 16:03:16 -0500 Received: from [192.168.30.20] (obelix.cs.byu.edu [128.187.81.137]) (authenticated bits=0) by tuxrocks.com (8.13.1/8.13.1) with ESMTP id jAAL3AlB006787 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 10 Nov 2005 14:03:12 -0700 User-Agent: Mozilla Thunderbird 1.0.7-1.1.fc3 (X11/20050929) X-Accept-Language: en-us, en To: Petr Baudis , Git Mailing List In-Reply-To: <4373B1A6.8000706@tuxrocks.com> X-Enigmail-Version: 0.92.1.0 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This patch allows cg-log to ignore merges by default,but will display them if requested (with "--show-merges"). Signed-off-by: Frank Sorenson cg-log | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cg-log b/cg-log index 7d955e3..ed2278e 100755 - --- a/cg-log +++ b/cg-log @@ -58,6 +58,9 @@ # by their author. This is also known as a "shortlog", suitable # e.g. for contribution summaries of announcements. # +# --show-merges:: +# Display merges in the log as well (ignored by default). +# # -uUSERNAME:: # List only commits where author or committer contains 'USERNAME'. # The search for 'USERNAME' is case-insensitive. @@ -255,6 +258,7 @@ user= mergebase= date_from= date_to= +no_merges="--no-merges" while optparse; do if optparse -c; then @@ -300,6 +304,8 @@ while optparse; do summary=1 elif optparse --summary; then shortlog=1 + elif optparse --show-merges; then + no_merges="" else optfail fi @@ -315,9 +321,9 @@ if [ "$mergebase" ]; then fi if [ "$shortlog" ]; then - - revls="git-rev-list --pretty=short $date_from $date_to" + revls="git-rev-list --pretty=short $no_merges $date_from $date_to" else - - revls="git-rev-list --pretty=raw $date_from $date_to" + revls="git-rev-list --pretty=raw $no_merges $date_from $date_to" fi revls="$revls $date_from $date_to" Frank - -- Frank Sorenson - KD7TZK Systems Manager, Computer Science Department Brigham Young University frank@tuxrocks.com -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.7 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org iD8DBQFDc7WOaI0dwg4A47wRAsPuAJ0W0s82jfxu+c/oHRPULaa5l9ITagCdEkhz NZAE2w8SnNbHl3/8MDtFT3w= =4cRS -----END PGP SIGNATURE-----