[PATCH 9/9] update 'git apply' bash-completion according to its man page

DORMANTno replies

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

[PATCH 9/9] update 'git apply' bash-completion according to its man page

From: Emmanuel Trillaud <hidden>
Date: 2016-06-15 22:47:12

---
 contrib/completion/git-completion.bash |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 8ba1249..c08422c 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -694,9 +694,15 @@ _git_apply ()
 	--*)
 		__gitcomp "
 			--stat --numstat --summary --check --index
-			--cached --index-info --reverse --reject --unidiff-zero
-			--apply --no-add --exclude=
+			--cached
+			--build-fake-ancestor=
+			--index-info --reverse --reject --unidiff-zero
+			--apply --no-add
+			--exclude=
+			--include=
 			--whitespace= --inaccurate-eof --verbose
+			--recount
+			--directory=
 			"
 		return
 	esac
-- 
1.6.4

Re: [PATCH 9/9] update 'git apply' bash-completion according to its man page

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:47:12

Emmanuel Trillaud [off-list ref] writes:
quoted hunk
---
 contrib/completion/git-completion.bash |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 8ba1249..c08422c 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -694,9 +694,15 @@ _git_apply ()
 	--*)
 		__gitcomp "
 			--stat --numstat --summary --check --index
-			--cached --index-info --reverse --reject --unidiff-zero
-			--apply --no-add --exclude=
+			--cached
+			--build-fake-ancestor=
+			--index-info --reverse --reject --unidiff-zero
+			--apply --no-add
+			--exclude=
+			--include=
 			--whitespace= --inaccurate-eof --verbose
+			--recount
+			--directory=
I'd rather suggest dropping --no-add that is script-only and not useful in
interactive use.  I also won't add --build-fake-ancestor for the same
reason.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help