File manager - Edit - /usr/local/cpanel/3rdparty/share/man/man1/git-merge-one-file.1
Back
'\" t .\" Title: git-merge-one-file .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> .\" Date: 07/09/2025 .\" Manual: Git Manual .\" Source: Git 2.48.2 .\" Language: English .\" .TH "GIT\-MERGE\-ONE\-FILE" "1" "07/09/2025" "Git 2\&.48\&.2" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .\" http://bugs.debian.org/507673 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .ie \n(.g .ds Aq \(aq .el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- .SH "NAME" git-merge-one-file \- The standard helper program to use with git\-merge\-index .SH "SYNOPSIS" .sp .nf \fIgit merge\-one\-file\fR .fi .sp .SH "DESCRIPTION" .sp This is the standard helper program to use with \fIgit merge\-index\fR to resolve a merge after the trivial merge done with \fIgit read\-tree \-m\fR\&. .SH "GIT" .sp Part of the \fBgit\fR(1) suite
| ver. 1.4 |
Github
|
.
| PHP 8.1.34 | Generation time: 0.04 |
proxy
|
phpinfo
|
Settings