git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] completion: complete --scissors option of git-am
@ 2009-09-08  6:57 Stephen Boyd
  0 siblings, 0 replies; only message in thread
From: Stephen Boyd @ 2009-09-08  6:57 UTC (permalink / raw)
  To: Shawn O. Pearce; +Cc: Junio C Hamano, git

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

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index bf688e1..226e3ea 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -676,7 +676,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
-- 
1.6.5.rc0

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2009-09-08  6:56 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-08  6:57 [PATCH] completion: complete --scissors option of git-am Stephen Boyd

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).