git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 try2 11/14] completion: update --staged options

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Apr 25, 2014, 18:12 UTC
Message-ID
<1398449567-16314-12-git-send-email-felipe.contreras@gmail.com>
In-Reply-To
<1398449567-16314-1-git-send-email-felipe.contreras@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-completion.bash | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 2ec7b1a..52d83f2 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -889,7 +889,7 @@ _git_apply ()
 		__gitcomp "
 			--stat --numstat --summary --check --index
 			--cached --index-info --reverse --reject --unidiff-zero
-			--apply --no-add --exclude=
+			--apply --no-add --exclude= --staged
 			--ignore-whitespace --ignore-space-change
 			--whitespace= --inaccurate-eof --verbose
 			"
@@ -1302,7 +1302,7 @@ _git_grep ()
 	case "$cur" in
 	--*)
 		__gitcomp "
-			--cached
+			--cached --staged
 			--text --ignore-case --word-regexp --invert-match
 			--full-name --line-number
 			--extended-regexp --basic-regexp --fixed-strings
@@ -2270,7 +2270,7 @@ _git_rm ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--cached --dry-run --ignore-unmatch --quiet"
+		__gitcomp "--cached --staged --dry-run --ignore-unmatch --quiet"
 		return
 		;;
 	esac
@@ -2337,7 +2337,7 @@ _git_show_branch ()
 
 _git_stash ()
 {
-	local save_opts='--keep-index --no-keep-index --quiet --patch'
+	local save_opts='--keep-index --no-keep-index --stage --no-stage --quiet --patch'
 	local subcommands='save list show apply clear drop pop create branch'
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
@@ -2357,7 +2357,7 @@ _git_stash ()
 			__gitcomp "$save_opts"
 			;;
 		apply,--*|pop,--*)
-			__gitcomp "--index --quiet"
+			__gitcomp "--index --stage --quiet"
 			;;
 		show,--*|drop,--*|branch,--*)
 			;;
-- 
1.9.2+fc1.2.gfbaae8c
Previous: Felipe ContrerasNext: Felipe Contreras
Message 12 of 16 in “Officially start moving to the term 'staging area'”
  1. 00/14 Officially start moving to the term 'staging area'Felipe Contreras, Apr 25, 2014
  2. 01/14 Add proper 'stage' commandFelipe Contreras, Apr 25, 2014
  3. 02/14 stage: add edit commandFelipe Contreras, Apr 25, 2014
  4. 03/14 diff: document --stagedFelipe Contreras, Apr 25, 2014
  5. 04/14 grep: add --staged optionFelipe Contreras, Apr 25, 2014
  6. 05/14 rm: add --staged optionFelipe Contreras, Apr 25, 2014
  7. 06/14 stash: add --stage option to saveFelipe Contreras, Apr 25, 2014
  8. 07/14 stash: add --stage to pop and applyFelipe Contreras, Apr 25, 2014
  9. 08/14 submodule: add --staged optionsFelipe Contreras, Apr 25, 2014
  10. 09/14 apply: add --stage optionFelipe Contreras, Apr 25, 2014
  11. 10/14 apply: add --work, --no-work optionsFelipe Contreras, Apr 25, 2014
  12. 11/14 completion: update --staged optionsFelipe Contreras, Apr 25, 2014
  13. 12/14 reset: add --stage and --work optionsFelipe Contreras, Apr 25, 2014
  14. 13/14 reset: allow --keep with --stageFelipe Contreras, Apr 25, 2014
  15. 14/14 completion: update 'git reset' new stage optionsFelipe Contreras, Apr 25, 2014
  16. Hilco WijbengaApr 26, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.