mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
'git-merge': Documentation.
... and add link from git.txt, as usual. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
2276aa6c09
commit
0f69be5376
52
Documentation/git-merge.txt
Normal file
52
Documentation/git-merge.txt
Normal file
|
@ -0,0 +1,52 @@
|
|||
git-merge(1)
|
||||
============
|
||||
v0.99.6, Sep 2005
|
||||
|
||||
NAME
|
||||
----
|
||||
git-merge - Grand Unified Merge Driver
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-merge' [-n] [-s <strategy>]... <msg> <head> <remote> <remote>...
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
This is the top-level user interface to the merge machinery
|
||||
which drives multiple merge strategy scripts.
|
||||
|
||||
|
||||
OPTIONS
|
||||
-------
|
||||
-n::
|
||||
Do not show diffstat at the end of the merge.
|
||||
|
||||
-s <strategy>::
|
||||
use that merge strategy; can be given more than once to
|
||||
specify them in the order they should be tried. If
|
||||
there is no `-s` option, built-in list of strategies is
|
||||
used instead.
|
||||
|
||||
<head>::
|
||||
our branch head commit.
|
||||
|
||||
<remote>::
|
||||
other branch head merged into our branch. You need at
|
||||
least one <remote>. Specifying more than one <remote>
|
||||
obviously means you are trying an Octopus.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano <junkio@cox.net>
|
||||
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the link:git.html[git] suite
|
|
@ -257,6 +257,9 @@ link:git-ls-remote.html[git-ls-remote]::
|
|||
Shows references in a remote or local repository.
|
||||
Previously this command was known as git-ls-remote-script.
|
||||
|
||||
link:git-merge.html[git-merge]::
|
||||
Grand unified merge driver.
|
||||
|
||||
link:git-octopus.html[git-octopus]::
|
||||
Merge more than two commits.
|
||||
Previously this command was known as git-octopus-script.
|
||||
|
|
Loading…
Reference in a new issue