diff options
Diffstat (limited to 'devdocs/git/git-merge-one-file.html')
| -rw-r--r-- | devdocs/git/git-merge-one-file.html | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/devdocs/git/git-merge-one-file.html b/devdocs/git/git-merge-one-file.html new file mode 100644 index 00000000..96385823 --- /dev/null +++ b/devdocs/git/git-merge-one-file.html @@ -0,0 +1,6 @@ +<h1>git-merge-one-file</h1> <h2 id="_name">Name</h2> <div class="sectionbody"> <p>git-merge-one-file - The standard helper program to use with git-merge-index</p> </div> <h2 id="_synopsis">Synopsis</h2> <div class="sectionbody"> <div class="verseblock"> <pre class="content" data-language="shell">git merge-one-file</pre> </div> </div> <h2 id="_description">Description</h2> <div class="sectionbody"> <p>This is the standard helper program to use with <code>git merge-index</code> to resolve a merge after the trivial merge done with <code>git read-tree -m</code>.</p> </div><div class="_attribution"> + <p class="_attribution-p"> + © 2012–2024 Scott Chacon and others<br>Licensed under the MIT License.<br> + <a href="https://git-scm.com/docs/git-merge-one-file" class="_attribution-link">https://git-scm.com/docs/git-merge-one-file</a> + </p> +</div> |