git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Fernando Ramos <greenfoo@u92.eu>
To: Junio C Hamano <gitster@pobox.com>
Cc: Philippe Blain <levraiphilippeblain@gmail.com>,
	git@vger.kernel.org, davvid@gmail.com, sunshine@sunshineco.com,
	seth@eseth.com, rogi@skylittlesystem.org
Subject: Re: [PATCH v6 3/3] vimdiff: add tool documentation
Date: Mon, 28 Mar 2022 00:17:49 +0200	[thread overview]
Message-ID: <YkDijfPgoiVObrFD@zacax395.localdomain> (raw)
In-Reply-To: <xmqqmthb5aw8.fsf@gitster.g>

> 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.

  reply	other threads:[~2022-03-27 22:18 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-27 11:23 [PATCH v6 0/3] vimdiff: new implementation with layout support Fernando Ramos
2022-03-27 11:23 ` [PATCH v6 1/3] " Fernando Ramos
2022-03-27 16:47   ` Philippe Blain
2022-03-27 18:12     ` Fernando Ramos
2022-03-27 21:36   ` Junio C Hamano
2022-03-27 11:23 ` [PATCH v6 2/3] vimdiff: integrate layout tests in the unit tests framework ('t' folder) Fernando Ramos
2022-03-27 21:37   ` Junio C Hamano
2022-03-27 11:23 ` [PATCH v6 3/3] vimdiff: add tool documentation Fernando Ramos
2022-03-27 18:28   ` Philippe Blain
2022-03-27 18:50     ` [PATCH] fixup! " Philippe Blain
2022-03-27 21:10     ` [PATCH v6 3/3] " Fernando Ramos
2022-03-27 21:43       ` Junio C Hamano
2022-03-27 22:17         ` Fernando Ramos [this message]
2022-03-28  4:48   ` Bagas Sanjaya
2022-03-28  5:43     ` Junio C Hamano
2022-03-28 19:19       ` Fernando Ramos

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YkDijfPgoiVObrFD@zacax395.localdomain \
    --to=greenfoo@u92.eu \
    --cc=davvid@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=levraiphilippeblain@gmail.com \
    --cc=rogi@skylittlesystem.org \
    --cc=seth@eseth.com \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).