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

[PATCH] squash! bash-completion: add support for git-log --merges= and log.merges

From
SZEDER Gábor <szeder@ira.uka.de>
Date
Apr 21, 2015, 12:51 UTC
Message-ID
<1429620684-7760-1-git-send-email-szeder@ira.uka.de>
In-Reply-To
<1428938968-19013-5-git-send-email-koosha@posteo.de>

--- The patch at the tip of kk/log-merges-config misindented one of the case arms, this one amends it.

 contrib/completion/git-completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index a75d7f5..83b2359 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1454,9 +1454,9 @@ _git_log ()
 	--merges=*)
 		__gitcomp "show hide only" "" "${cur##--merges=}"
 		return
 		;;
-		--*)
+	--*)
 		__gitcomp "
 			$__git_log_common_options
 			$__git_log_shortlog_options
 			$__git_log_gitk_options
-- 
1.9.5.msysgit.0
Previous: Koosha KhajehmoogahiNext: Junio C Hamano
Message 11 of 12 in “revision: add --merges={show|only|hide} option”
  1. 1/5 revision: add --merges={show|only|hide} optionKoosha Khajehmoogahi, Apr 13, 2015
  2. 2/5 log: honor log.merges= optionKoosha Khajehmoogahi, Apr 13, 2015
  3. Junio C HamanoApr 16, 2015
  4. 3/5 Documentation: add git-log --merges= option and log.merges config. varKoosha Khajehmoogahi, Apr 13, 2015
  5. Eric SunshineApr 14, 2015
  6. Koosha KhajehmoogahiApr 15, 2015
  7. Eric SunshineApr 16, 2015
  8. 4/5 t4202-log: add tests for --merges=Koosha Khajehmoogahi, Apr 13, 2015
  9. Eric SunshineApr 14, 2015
  10. 5/5 bash-completion: add support for git-log --merges= and log.mergesKoosha Khajehmoogahi, Apr 13, 2015
  11. squash! bash-completion: add support for git-log --merges= and log.mergesSZEDER Gábor, Apr 21, 2015
  12. Junio C HamanoApr 21, 2015

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.