| commit | 8077612ea12e80b20e307e279916710b99fe6362 | |
| author | Martin Ågren <martin.agren@gmail.com> | |
| Wed, 1 Nov 2023 19:24:18 +0000 (1 19:24 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 Nov 2023 23:51:38 +0000 (2 08:51 +0900) | ||
| tree | 1f508cfaa959d30538f72848379fc87e38a2f10e | treesnapshot (tar.gz zip) |
| parent | 43c8a30d150ecede9709c1f2527c8fba92c65f40 | commitdiff |
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>
`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>
| Documentation/git-merge-file.txt | diffblobblamehistory |