GIT-MERGE-ONE-FIL(1) Git Manual GIT-MERGE-ONE-FIL(1)
git-merge-one-file - The standard helper program to use with git-merge-index
This is the standard helper program to use with git merge-index to resolve a merge after the trivial merge done with git read-tree -m.
Part of the git(1) suite
This page is part of the git (Git distributed version control system) project. Information about the project can be found at ⟨http://git-scm.com/⟩. If you have a bug report for this manual page, see ⟨http://git-scm.com/community⟩. This page was obtained from the project's upstream Git repository ⟨https://github.com/git/git.git⟩ on 2021-04-01. (At that time, the date of the most recent commit that was found in the repository was 2021-03-30.) If you discover any rendering problems in this HTML version of the page, or you believe there is a better or more up-to-date source for the page, or you have corrections or improvements to the information in this COLOPHON (which is not part of the original manual page), send a mail to firstname.lastname@example.org Git 188.8.131.52.ga65ce7 04/01/2021 GIT-MERGE-ONE-FIL(1)
Pages that refer to this page: git(1)