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

Re: [PATCH v6 3/3] vimdiff: add tool documentation

From
Fernando Ramos <greenfoo@u92.eu>
Date
Mar 27, 2022, 22:17 UTC
Message-ID
<YkDijfPgoiVObrFD@zacax395.localdomain>
In-Reply-To
<xmqqmthb5aw8.fsf@gitster.g>
Show 22 quoted lines
> Are you signalling the above part that it is (or isn't) included in
> git-mergetool.txt by defining
> 
> 	:git-mergetool: 1
> 
> before the piece gets included with
> 
> 	include::config/mergetool.txt
> 
> See for example how git-rev-list.txt tweaks what gets included from
> rev-list-description.txt by doing:
> 
>     'git rev-list' [<options>] <commit>... [[--] <path>...]
> 
>     DESCRIPTION
>     -----------
> 
>     :git-rev-list: 1
>     include::rev-list-description.txt[]
> 
>     'rev-list' is a very essential Git command, since it
> 

Thanks for the hint. It is now working as expected. I'll include the fix in v7 together with the other fixes that prevent `git apply` from executing cleanly.

Previous: Junio C HamanoNext: Bagas Sanjaya
Message 13 of 16 in “vimdiff: new implementation with layout support”
  1. 0/3 vimdiff: new implementation with layout supportFernando Ramos, Mar 27, 2022
  2. 1/3 vimdiff: new implementation with layout supportFernando Ramos, Mar 27, 2022
  3. Philippe BlainMar 27, 2022
  4. Fernando RamosMar 27, 2022
  5. Junio C HamanoMar 27, 2022
  6. 2/3 vimdiff: integrate layout tests in the unit tests framework ('t' folder)Fernando Ramos, Mar 27, 2022
  7. Junio C HamanoMar 27, 2022
  8. 3/3 vimdiff: add tool documentationFernando Ramos, Mar 27, 2022
  9. Philippe BlainMar 27, 2022
  10. fixup! vimdiff: add tool documentationPhilippe Blain, Mar 27, 2022
  11. Fernando RamosMar 27, 2022
  12. Junio C HamanoMar 27, 2022
  13. Fernando RamosMar 27, 2022
  14. Bagas SanjayaMar 28, 2022
  15. Junio C HamanoMar 28, 2022
  16. Fernando RamosMar 28, 2022

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.