diff options
| author | Martin Ågren <martin.agren@gmail.com> | 2023-11-01 22:24:18 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-02 02:51:38 +0300 |
| commit | 8077612ea12e80b20e307e279916710b99fe6362 (patch) | |
| tree | 1f508cfaa959d30538f72848379fc87e38a2f10e /t/t6403-merge-file.sh | |
| parent | 43c8a30d150ecede9709c1f2527c8fba92c65f40 (diff) | |
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.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: brian m. carlson <bk2204@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6403-merge-file.sh')
0 files changed, 0 insertions, 0 deletions