From: Jeff King <peff@peff.net>
To: Richard Hansen <hansenr@google.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] diff: document behavior of relative diff.orderFile
Date: Tue, 10 Jan 2017 01:58:16 -0500 [thread overview]
Message-ID: <20170110065816.pu325sxajbyuqpj6@sigill.intra.peff.net> (raw)
In-Reply-To: <20170110004031.57985-2-hansenr@google.com>
On Mon, Jan 09, 2017 at 07:40:30PM -0500, Richard Hansen wrote:
> Document that a relative pathname for diff.orderFile is interpreted as
> relative to the top-level work directory.
>
> Signed-off-by: Richard Hansen <hansenr@google.com>
> ---
> Documentation/diff-config.txt | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
> index 58f4bd6af..875212045 100644
> --- a/Documentation/diff-config.txt
> +++ b/Documentation/diff-config.txt
> @@ -101,6 +101,8 @@ diff.noprefix::
> diff.orderFile::
> File indicating how to order files within a diff, using
> one shell glob pattern per line.
> + If `diff.orderFile` is a relative pathname, it is treated as
> + relative to the top of the work tree.
> Can be overridden by the '-O' option to linkgit:git-diff[1].
What happens in a bare repository?
I'm guessing it's relative to the top-level of the repository, but we
should probably spell it out.
The other case is --no-index when we are not in a repository at all, but
that should just be relative to the current directory, which isn't
really worth mentioning.
-Peff
next prev parent reply other threads:[~2017-01-10 6:58 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-10 0:40 [PATCH 0/2] minor diff orderfile documentation improvements Richard Hansen
2017-01-10 0:40 ` [PATCH 1/2] diff: document behavior of relative diff.orderFile Richard Hansen
2017-01-10 6:58 ` Jeff King [this message]
2017-01-10 17:27 ` Richard Hansen
2017-01-10 20:19 ` Junio C Hamano
2017-01-10 20:23 ` Junio C Hamano
2017-01-10 22:01 ` Richard Hansen
2017-01-10 22:15 ` Junio C Hamano
2017-01-11 14:41 ` Jeff King
2017-01-11 20:53 ` Junio C Hamano
2017-01-10 0:40 ` [PATCH 2/2] diff: document the pattern format for diff.orderFile Richard Hansen
2017-01-10 20:14 ` Junio C Hamano
2017-01-11 1:14 ` Richard Hansen
2017-01-11 2:46 ` Junio C Hamano
2017-01-11 17:24 ` Richard Hansen
2017-01-11 18:15 ` Junio C Hamano
2017-01-11 18:36 ` Richard Hansen
2017-01-11 21:06 ` Junio C Hamano
2017-01-11 1:57 ` [PATCH v2 0/2] diff orderfile documentation improvements Richard Hansen
2017-01-11 1:57 ` [PATCH v2 1/2] diff: document behavior of relative diff.orderFile Richard Hansen
2017-01-11 1:57 ` [PATCH v2 2/2] diff: document the format of the -O (diff.orderFile) file Richard Hansen
2017-01-15 22:16 ` [PATCH v3 0/2] diff orderfile documentation improvements Richard Hansen
2017-01-15 22:16 ` [PATCH v3 1/2] diff: document behavior of relative diff.orderFile Richard Hansen
2017-01-15 22:16 ` [PATCH v3 2/2] diff: document the format of the -O (diff.orderFile) file Richard Hansen
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=20170110065816.pu325sxajbyuqpj6@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=hansenr@google.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).