From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Contreras Subject: [PATCH v2 11/14] completion: update --staged options Date: Mon, 14 Oct 2013 17:29:28 -0500 Message-ID: <1381789769-9893-14-git-send-email-felipe.contreras@gmail.com> References: <1381789769-9893-1-git-send-email-felipe.contreras@gmail.com> Cc: Piotr Krukowiecki , Jay Soffian , Jonathan Nieder , Philip Oakley , Matthieu Moy , William Swanson , Ping Yin , Hilco Wijbenga , Miles Bader , Felipe Contreras To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Oct 15 00:36:43 2013 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 1VVqkk-0007Zn-S6 for gcvg-git-2@plane.gmane.org; Tue, 15 Oct 2013 00:36:43 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932283Ab3JNWga (ORCPT ); Mon, 14 Oct 2013 18:36:30 -0400 Received: from mail-oa0-f46.google.com ([209.85.219.46]:34965 "EHLO mail-oa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932218Ab3JNWgY (ORCPT ); Mon, 14 Oct 2013 18:36:24 -0400 Received: by mail-oa0-f46.google.com with SMTP id g12so770625oah.19 for ; Mon, 14 Oct 2013 15:36:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7AkUHiGl19sYeDd7SqfgYLdqvrJhRnd11BtqE3CIMrI=; b=e8x3HEPnXlmjBECgCHOOW5dZzCXMPMyYNt6Kr1cRTRjGv76EuOfAeDBnV0BW7oe0dw 8spbyUugxfC+uxRgpiTgiERiRB810RRre3zleEg8mFrnSlXzhnuIdHDpZR84fx4Df21l gfxUUTsC05hnHTT1g6/P6pn3FOjwPJ4uKJUCkoXN7oJGoPDOEfOkzLM+BPwpPqImpnk+ Nn4EwkADi0IGKgn1GUP1OXwx423+569b6DyaAZlkmIZRaCde7qcH9Af0H6pN8bi4PrVB fTw53a7wze25iabzI1iIuUBhBDFVhiKhA7UfjlxCfkxqogMmadGG1U/Sj5YHjs7msmNg JeiA== X-Received: by 10.60.58.71 with SMTP id o7mr3202025oeq.51.1381790183712; Mon, 14 Oct 2013 15:36:23 -0700 (PDT) Received: from localhost (187-162-140-241.static.axtel.net. [187.162.140.241]) by mx.google.com with ESMTPSA id r6sm44567061obi.14.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 14 Oct 2013 15:36:22 -0700 (PDT) X-Mailer: git-send-email 1.8.4-fc In-Reply-To: <1381789769-9893-1-git-send-email-felipe.contreras@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 2b81e78..1dde51f 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -881,7 +881,7 @@ _git_apply () __gitcomp " --stat --numstat --summary --check --index --cached --index-info --reverse --reject --unidiff-zero - --apply --no-add --exclude= + --apply --no-add --exclude= --staged --ignore-whitespace --ignore-space-change --whitespace= --inaccurate-eof --verbose " @@ -1294,7 +1294,7 @@ _git_grep () case "$cur" in --*) __gitcomp " - --cached + --cached --staged --text --ignore-case --word-regexp --invert-match --full-name --line-number --extended-regexp --basic-regexp --fixed-strings @@ -2253,7 +2253,7 @@ _git_rm () { case "$cur" in --*) - __gitcomp "--cached --dry-run --ignore-unmatch --quiet" + __gitcomp "--cached --staged --dry-run --ignore-unmatch --quiet" return ;; esac @@ -2320,7 +2320,7 @@ _git_show_branch () _git_stash () { - local save_opts='--keep-index --no-keep-index --quiet --patch' + local save_opts='--keep-index --no-keep-index --stage --no-stage --quiet --patch' local subcommands='save list show apply clear drop pop create branch' local subcommand="$(__git_find_on_cmdline "$subcommands")" if [ -z "$subcommand" ]; then @@ -2340,7 +2340,7 @@ _git_stash () __gitcomp "$save_opts" ;; apply,--*|pop,--*) - __gitcomp "--index --quiet" + __gitcomp "--index --stage --quiet" ;; show,--*|drop,--*|branch,--*) ;; -- 1.8.4-fc