Files
git/Documentation
Martin Ågren 8077612ea1 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>
2023-11-02 08:51:38 +09:00
..
2023-08-21 09:34:58 -07:00
2023-06-12 13:52:51 -07:00
2023-02-18 09:29:13 -08:00
2023-06-12 13:52:51 -07:00
2023-06-12 13:52:51 -07:00
2023-06-12 13:52:51 -07:00
2022-10-25 15:44:18 -07:00
2023-06-12 13:52:51 -07:00
2022-02-02 14:50:09 -08:00
2023-05-06 14:32:20 -07:00
2021-09-28 10:31:02 -07:00
2023-06-12 13:52:51 -07:00
2023-06-12 13:52:51 -07:00
2021-12-10 14:35:03 -08:00
2023-05-16 11:38:14 -07:00
2023-06-27 11:31:06 -07:00
2023-07-31 09:11:04 -07:00
2023-06-12 13:52:51 -07:00
2023-06-12 13:52:51 -07:00