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

[PATCH 24/78] config.txt: move fmt-merge-msg-config.txt to config/

From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date
Oct 27, 2018, 06:22 UTC
Message-ID
<20181027062351.30446-25-pclouds@gmail.com>
In-Reply-To
<20181027062351.30446-1-pclouds@gmail.com>

Note that this file is not directly included in config.txt but through merge-config.txt and it's in "merge" section instead of a separate "fmtMergeMsg" section like others.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 .../{fmt-merge-msg-config.txt => config/fmt-merge-msg.txt}      | 0
 Documentation/git-fmt-merge-msg.txt                             | 2 +-
 Documentation/merge-config.txt                                  | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename Documentation/{fmt-merge-msg-config.txt => config/fmt-merge-msg.txt} (100%)
diff --git a/Documentation/fmt-merge-msg-config.txt b/Documentation/config/fmt-merge-msg.txt
similarity index 100%
rename from Documentation/fmt-merge-msg-config.txt
rename to Documentation/config/fmt-merge-msg.txt
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 423b6e033b..6793d8fc05 100644
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -51,7 +51,7 @@ OPTIONS
 
 CONFIGURATION
 -------------
-include::fmt-merge-msg-config.txt[]
+include::config/fmt-merge-msg.txt[]
 
 merge.summary::
 	Synonym to `merge.log`; this is deprecated and will be removed in
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 662c2713ca..0bb703fbac 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -30,7 +30,7 @@ merge.verifySignatures::
 	If true, this is equivalent to the --verify-signatures command
 	line option. See linkgit:git-merge[1] for details.
 
-include::fmt-merge-msg-config.txt[]
+include::config/fmt-merge-msg.txt[]
 
 merge.renameLimit::
 	The number of files to consider when performing rename detection

-- 
2.19.1.647.g708186aaf9
Previous: Nguyễn Thái Ngọc DuyNext: Nguyễn Thái Ngọc Duy
Message 25 of 80 in “nd/config-split reroll”
  1. 00/78 nd/config-split rerollNguyễn Thái Ngọc Duy, Oct 27, 2018
  2. 01/78 Update makefile in preparation for Documentation/config/*.txtNguyễn Thái Ngọc Duy, Oct 27, 2018
  3. 02/78 config.txt: move advice.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  4. 04/78 config.txt: move add.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  5. 05/78 config.txt: move alias.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  6. 03/78 config.txt: move core.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  7. 06/78 config.txt: move am.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  8. 07/78 config.txt: move apply.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  9. 08/78 config.txt: move blame.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  10. 09/78 config.txt: move branch.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  11. 11/78 config.txt: move checkout.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  12. 12/78 config.txt: move clean.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  13. 10/78 config.txt: move browser.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  14. 14/78 config.txt: move column.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  15. 13/78 config.txt: move color.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  16. 15/78 config.txt: move commit.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  17. 16/78 config.txt: move credential.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  18. 17/78 config.txt: move completion.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  19. 18/78 config.txt: move diff-config.txt to config/Nguyễn Thái Ngọc Duy, Oct 27, 2018
  20. 20/78 config.txt: move fastimport.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  21. 19/78 config.txt: move difftool.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  22. 21/78 config.txt: move fetch-config.txt to config/Nguyễn Thái Ngọc Duy, Oct 27, 2018
  23. 22/78 config.txt: move filter.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  24. 23/78 config.txt: move format-config.txt to config/Nguyễn Thái Ngọc Duy, Oct 27, 2018
  25. 24/78 config.txt: move fmt-merge-msg-config.txt to config/Nguyễn Thái Ngọc Duy, Oct 27, 2018
  26. 25/78 config.txt: move fsck.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  27. 26/78 config.txt: move gc.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  28. 27/78 config.txt: move gitcvs-config.txt to config/Nguyễn Thái Ngọc Duy, Oct 27, 2018
  29. 28/78 config.txt: move gitweb.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  30. 29/78 config.txt: move grep.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  31. 31/78 config.txt: move gui-config.txt to config/Nguyễn Thái Ngọc Duy, Oct 27, 2018
  32. 33/78 config.txt: move help.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  33. 32/78 config.txt: move guitool.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  34. 34/78 config.txt: move ssh.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  35. 30/78 config.txt: move gpg.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  36. 35/78 config.txt: move http.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  37. 36/78 config.txt: move i18n.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  38. 37/78 git-imap-send.txt: move imap.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  39. 41/78 config.txt: move interactive.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  40. 39/78 config.txt: move init.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  41. 43/78 config.txt: move mailinfo.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  42. 44/78 config.txt: move mailmap.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  43. 45/78 config.txt: move man.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  44. 46/78 config.txt: move merge-config.txt to config/Nguyễn Thái Ngọc Duy, Oct 27, 2018
  45. 40/78 config.txt: move instaweb.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  46. 47/78 config.txt: move mergetool.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  47. 48/78 config.txt: move notes.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  48. 50/78 config.txt: move pager.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  49. 49/78 config.txt: move pack.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  50. 53/78 config.txt: move pull-config.txt to config/Nguyễn Thái Ngọc Duy, Oct 27, 2018
  51. 52/78 config.txt: move protocol.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  52. 54/78 config.txt: move push-config.txt to config/Nguyễn Thái Ngọc Duy, Oct 27, 2018
  53. 55/78 config.txt: move rebase-config.txt to config/Nguyễn Thái Ngọc Duy, Oct 27, 2018
  54. 56/78 config.txt: move receive-config.txt to config/Nguyễn Thái Ngọc Duy, Oct 27, 2018
  55. 57/78 config.txt: move remote.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  56. 51/78 config.txt: move pretty.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  57. 59/78 config.txt: move repack.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  58. 58/78 config.txt: move remotes.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  59. 60/78 config.txt: move rerere.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  60. 62/78 config.txt: move sendemail-config.txt to config/Nguyễn Thái Ngọc Duy, Oct 27, 2018
  61. 63/78 config.txt: move sequencer.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  62. 64/78 config.txt: move showBranch.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  63. 65/78 config.txt: move splitIndex.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  64. 61/78 config.txt: move reset.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  65. 67/78 config.txt: move stash.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  66. 68/78 config.txt: move submodule.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  67. 69/78 config.txt: move tag.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  68. 66/78 config.txt: move status.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  69. 70/78 config.txt: move transfer.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  70. 72/78 config.txt: move uploadpack.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  71. 73/78 config.txt: move url.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  72. 71/78 config.txt: move uploadarchive.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  73. 75/78 config.txt: move versionsort.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  74. 74/78 config.txt: move user.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  75. 76/78 config.txt: move web.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  76. 78/78 config.txt: remove config/dummy.txtNguyễn Thái Ngọc Duy, Oct 27, 2018
  77. 77/78 config.txt: move worktree.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  78. 42/78 config.txt: move log.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  79. 38/78 config.txt: move index.* to a separate fileNguyễn Thái Ngọc Duy, Oct 27, 2018
  80. Junio C HamanoOct 29, 2018

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.