git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Boyd <bebarino@gmail.com>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: [PATCH 2/3] completion: update am, commit, and log
Date: Wed,  7 Oct 2009 01:48:50 -0700	[thread overview]
Message-ID: <1254905331-29516-2-git-send-email-bebarino@gmail.com> (raw)
In-Reply-To: <1254905331-29516-1-git-send-email-bebarino@gmail.com>

git am learned --scissors, git commit learned --dry-run and git log
learned --decorate=long|short recently.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
 contrib/completion/git-completion.bash |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 332be99..2ab8c5e 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -668,7 +668,7 @@ _git_am ()
 			--3way --committer-date-is-author-date --ignore-date
 			--ignore-whitespace --ignore-space-change
 			--interactive --keep --no-utf8 --signoff --utf8
-			--whitespace=
+			--whitespace= --scissors
 			"
 		return
 	esac
@@ -894,6 +894,7 @@ _git_commit ()
 		__gitcomp "
 			--all --author= --signoff --verify --no-verify
 			--edit --amend --include --only --interactive
+			--dry-run
 			"
 		return
 	esac
@@ -1179,6 +1180,10 @@ _git_log ()
 		__gitcomp "$__git_log_date_formats" "" "${cur##--date=}"
 		return
 		;;
+	--decorate=*)
+		__gitcomp "long short" "" "${cur##--decorate=}"
+		return
+		;;
 	--*)
 		__gitcomp "
 			$__git_log_common_options
@@ -1191,7 +1196,7 @@ _git_log ()
 			--pretty= --format= --oneline
 			--cherry-pick
 			--graph
-			--decorate
+			--decorate --decorate=
 			--walk-reflogs
 			--parents --children
 			$merge
-- 
1.6.5.rc2.17.gdbc1b

  reply	other threads:[~2009-10-07  8:56 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-07  8:48 [PATCH 1/3] completion: fix alias listings with newlines Stephen Boyd
2009-10-07  8:48 ` Stephen Boyd [this message]
2009-10-07  8:48   ` [PATCH 3/3] completion: add dirstat and friends to diff options Stephen Boyd
2009-10-07 19:45     ` Junio C Hamano
     [not found]     ` <20091007205059.GA16235@neumann>
2009-10-07 23:07       ` Junio C Hamano
     [not found]         ` <20091007233442.GJ6055@neumann>
2009-10-08  0:11           ` Stephen Boyd
2009-10-08  4:32         ` Shawn O. Pearce
2009-10-07 19:45   ` [PATCH 2/3] completion: update am, commit, and log Junio C Hamano
2009-10-07  9:33 ` [PATCH 1/3] completion: fix alias listings with newlines Johannes Sixt
2009-10-07 18:55   ` Stephen Boyd
2009-10-08  4:29     ` Shawn O. Pearce
2009-10-08  7:34       ` Stephen Boyd
2009-10-08  7:54         ` Johannes Sixt
2009-10-08  8:01           ` Stephen Boyd
2009-10-08  8:10             ` Johannes Sixt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1254905331-29516-2-git-send-email-bebarino@gmail.com \
    --to=bebarino@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=spearce@spearce.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).