Re: [PATCH 14/16] mktree: optionally add to an existing tree

From: Patrick Steinhardt <ps@pks.im>
Date: Jun 12, 2024, 09:40 UTC
Message-ID: <ZmltKHI-Vz1L44r8@tanuki>
In-Reply-To: <df0c50dfea3cb77e0070246efdf7a3f070b2ad97.1718130288.git.gitgitgadget@gmail.com>

On Tue, Jun 11, 2024 at 06:24:46PM +0000, Victoria Dye via GitGitGadget wrote:

Show 12 quoted lines

> diff --git a/Documentation/git-mktree.txt b/Documentation/git-mktree.txt
> index afbc846d077..99abd3c31a6 100644
> --- a/Documentation/git-mktree.txt
> +++ b/Documentation/git-mktree.txt
> @@ -40,6 +40,11 @@ OPTIONS
>  	optional.  Note - if the `-z` option is used, lines are terminated
>  	with NUL.
>  
> +<tree-ish>::
> +	If provided, the tree entries provided in stdin are added to this tree
> +	rather than a new empty one, replacing existing entries with identical
> +	names. Not compatible with `--literally`.

I think it'd be a bit more intuitive is this was an option, like `--base-tree=` or just `--base=`.

One question that comes up naturally in this context: when I have a base tree, how do I remove entries from it?

Patrick