Re: [PATCH 2/3] add-patch: add diff.context command line overrides

From: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Date: May 5, 2025, 09:49 UTC
Message-ID: <d2dedbd7-6797-4f1d-a0b2-243f9bef57f2@app.fastmail.com>
In-Reply-To: <7700eb173e73bb240852dc1c7ce26f3d1f95d8ca.1746436719.git.gitgitgadget@gmail.com>

On Mon, May 5, 2025, at 11:18, Leon Michalak via GitGitGadget wrote:

Show 5 quoted lines

> From: Leon Michalak <leonmichalak6@gmail.com>
>
> This patch compliments `8b91eef812`, where builtins that accept
> `--patch` options now respect `diff.context` and `diff.interHunkContext`
> file configurations.

8b91eef812 is patch 1. This hash will change once the patches have been imported via git-am(1). So it won’t make sense when these patches land as commits.

I think the usual approach is to refer to a previous commit in the series as “in a previous commit we...”. Or maybe “in the previous commit” for this patch and “two commits ago” for patch 3.

For commits that are in the stable history (like `master`) the convention is to use:

    git show -s --pretty=reference <commit>

Without backticks (`).  See SubmittingPatches, commit-reference.