From mboxrd@z Thu Jan 1 00:00:00 1970 From: Koosha Khajehmoogahi Subject: [PATCH v2 5/5] bash-completion: add support for git-log --merges= and log.merges Date: Sat, 4 Apr 2015 03:22:01 +0200 Message-ID: <1428110521-31028-5-git-send-email-koosha@posteo.de> References: <266077> <1428110521-31028-1-git-send-email-koosha@posteo.de> Cc: sunshine@sunshineco.com To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Apr 04 03:23:13 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 1YeCno-00085F-4O for gcvg-git-2@plane.gmane.org; Sat, 04 Apr 2015 03:23:12 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752340AbbDDBXG (ORCPT ); Fri, 3 Apr 2015 21:23:06 -0400 Received: from mx02.posteo.de ([89.146.194.165]:60064 "EHLO mx02.posteo.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752274AbbDDBXD (ORCPT ); Fri, 3 Apr 2015 21:23:03 -0400 Received: from dovecot03.posteo.de (unknown [185.67.36.28]) by mx02.posteo.de (Postfix) with ESMTPS id ECE7625B17EF; Sat, 4 Apr 2015 03:23:00 +0200 (CEST) Received: from mail.posteo.de (localhost [127.0.0.1]) by dovecot03.posteo.de (Postfix) with ESMTPSA id 3lJgP05sCkz5vNB; Sat, 4 Apr 2015 03:23:00 +0200 (CEST) X-Mailer: git-send-email 2.3.3.263.g095251d.dirty In-Reply-To: <1428110521-31028-1-git-send-email-koosha@posteo.de> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Helped-by: Eric Sunshine Signed-off-by: Koosha Khajehmoogahi --- contrib/completion/git-completion.bash | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index fbe5972..a75d7f5 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1406,7 +1406,7 @@ _git_ls_tree () __git_log_common_options=" --not --all --branches --tags --remotes - --first-parent --merges --no-merges + --first-parent --merges --merges= --no-merges --max-count= --max-age= --since= --after= --min-age= --until= --before= @@ -1451,7 +1451,11 @@ _git_log () __gitcomp "long short" "" "${cur##--decorate=}" return ;; - --*) + --merges=*) + __gitcomp "show hide only" "" "${cur##--merges=}" + return + ;; + --*) __gitcomp " $__git_log_common_options $__git_log_shortlog_options @@ -1861,6 +1865,10 @@ _git_config () __gitcomp "$__git_log_date_formats" return ;; + log.merges) + __gitcomp "show hide only" + return + ;; sendemail.aliasesfiletype) __gitcomp "mutt mailrc pine elm gnus" return @@ -2150,6 +2158,7 @@ _git_config () interactive.singlekey log.date log.decorate + log.merges log.showroot mailmap.file man. -- 2.3.3.263.g095251d.dirty