On 2023-10-31 at 21:48:57, Martin Ågren wrote: > > On Mon, 30 Oct 2023 at 17:37, brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> wrote: > > > > Since we obviously won't be writing the data to the first argument, > > imply the -p option so we write to standard output. > > This paragraph changed from v1, but this doesn't match the actual > behavior, from what I can tell: `-p` is not implied. Yes, apparently that commit message snuck back in after it having been edited out. > -- >8 -- > Subject: [PATCH] git-merge-file doc: drop "-file" from argument placeholders > > `git merge-file` takes three positional arguments. Each of them is > documented as `<foo-file>`. In preparation for teaching this command to > alternatively take three object IDs, make these placeholders a bit more > generic by dropping the "-file" parts. Instead, clarify early that the > three arguments are filenames. Even after the next commit, we can afford > to present this file-centric view up front and in the general > discussion, since it will remain the default one. This seems reasonable. Junio, do you want to sneak this in and fix the commit message above, or do you want me to do a v3? -- brian m. carlson (he/him or they/them) Toronto, Ontario, CA
Attachment:
signature.asc
Description: PGP signature
