bash completion: 'git apply' should use 'fix' not 'strip'

Eric Raible · gitster · commit 7950659dc9ef · 2008-08-14T17:49:12.000-07:00
Bring completion up to date with the man page.

Signed-off-by: Eric Raible &lt;raible@gmail.com&gt;
Acked-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -501,7 +501,7 @@ __git_has_doubledash ()
 	return 1
 }
 
-__git_whitespacelist="nowarn warn error error-all strip"
+__git_whitespacelist="nowarn warn error error-all fix"
 
 _git_am ()
 {

Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,7 @@ __git_has_doubledash ()`
`501`	`501`	`return 1`
`502`	`502`	`}`
`503`	`503`
`504`		`-__git_whitespacelist="nowarn warn error error-all strip"`
	`504`	`+__git_whitespacelist="nowarn warn error error-all fix"`
`505`	`505`
`506`	`506`	`_git_am ()`
`507`	`507`	`{`