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

[PATCH 4/6] completion: Add git config advice completions

From
Rikard Falkeborn <rikard.falkeborn@gmail.com>
Date
May 27, 2017, 06:25 UTC
Message-ID
<20170527062552.13996-5-rikard.falkeborn@gmail.com>
In-Reply-To
<20170527062552.13996-1-rikard.falkeborn@gmail.com>
Add missing completions for git config advice:
* advice.amWorkDir
* advice.pushAlreadyExists
* advice.pushFetchFirst
* advice.pushNeedsForce
* advice.pushNonFFCurrent
* advice.pushNonFFMatching
* advice.pushUpdateRejected
* advice.rmHints
* advice.statusUoption

Remove completion for git config advice.pushNonFastForward, since it was renamed to pushUpdateRejected in 1184564eac8e. The config still works, but is no longer part of the documentation.

Signed-off-by: Rikard Falkeborn <rikard.falkeborn@gmail.com>
---
 contrib/completion/git-completion.bash | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 3a630a230..7efcb2a79 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2336,12 +2336,20 @@ _git_config ()
 	esac
 	__gitcomp "
 		add.ignoreErrors
+		advice.amWorkDir
 		advice.commitBeforeMerge
 		advice.detachedHead
 		advice.implicitIdentity
-		advice.pushNonFastForward
+		advice.pushAlreadyExists
+		advice.pushFetchFirst
+		advice.pushNeedsForce
+		advice.pushNonFFCurrent
+		advice.pushNonFFMatching
+		advice.pushUpdateRejected
 		advice.resolveConflict
+		advice.rmHints
 		advice.statusHints
+		advice.statusUoption
 		alias.
 		am.keepcr
 		am.threeWay

-- 
2.13.0
Previous: Rikard FalkebornNext: Rikard Falkeborn
Message 4 of 10 in “Some more git config completions”
  1. 0/6 Some more git config completionsRikard Falkeborn, May 27, 2017
  2. 2/6 completion: Add git config core completionsRikard Falkeborn, May 27, 2017
  3. 1/6 completion: Add git config gc completionsRikard Falkeborn, May 27, 2017
  4. 4/6 completion: Add git config advice completionsRikard Falkeborn, May 27, 2017
  5. 6/6 completion: Add git config credentialCache.ignoreSIGHUPRikard Falkeborn, May 27, 2017
  6. 3/6 completion: Add git config am.threeWay completionRikard Falkeborn, May 27, 2017
  7. 5/6 completion: Add git config credential completionsRikard Falkeborn, May 27, 2017
  8. Ævar Arnfjörð BjarmasonJun 1, 2017
  9. Junio C HamanoJun 2, 2017
  10. SZEDER GáborJun 4, 2017

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.