mirror of
https://github.com/git/git.git
synced 2025-04-23 13:17:40 +00:00
0b444cdb19
The documentation was quite inconsistent when spelling 'git cmd' if it only refers to the program, not to some specific invocation syntax: both 'git-cmd' and 'git cmd' spellings exist. The current trend goes towards dashless forms, and there is precedent in 647ac70 (git-svn.txt: stop using dash-form of commands., 2009-07-07) to actively eliminate the dashed variants. Replace 'git-cmd' with 'git cmd' throughout, except where git-shell, git-cvsserver, git-upload-pack, git-receive-pack, and git-upload-archive are concerned, because those really live in the $PATH.
30 lines
626 B
Plaintext
30 lines
626 B
Plaintext
git-merge-one-file(1)
|
|
=====================
|
|
|
|
NAME
|
|
----
|
|
git-merge-one-file - The standard helper program to use with git-merge-index
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git merge-one-file'
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
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'.
|
|
|
|
Author
|
|
------
|
|
Written by Linus Torvalds <torvalds@osdl.org>,
|
|
Junio C Hamano <gitster@pobox.com> and Petr Baudis <pasky@suse.cz>.
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[1] suite
|