summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Eric Raible <raible@gmail.com>2008-08-14 10:12:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-08-14 17:49:12 -0700
commit7950659dc9ef7f2b50b18010622299c508bfdfc3 (patch)
tree40ac300be5840efc63cc0c9cc1d8afd6bd7fc7d0 /contrib
parentMerge branch 'maint' (diff)
downloadtgif-7950659dc9ef7f2b50b18010622299c508bfdfc3.tar.xz
bash completion: 'git apply' should use 'fix' not 'strip'
Bring completion up to date with the man page. Signed-off-by: Eric Raible <raible@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 78189c1b7b..d1afe96e1c 100755
--- 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 ()
{