projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2276aa6)
'git-merge': Documentation.
authorJunio C Hamano <junkio@cox.net>
Fri, 9 Sep 2005 08:15:47 +0000 (01:15 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 11 Sep 2005 01:30:42 +0000 (18:30 -0700)
... and add link from git.txt, as usual.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-merge.txt [new file with mode: 0644] patch | blob
Documentation/git.txt patch | blob | history

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
new file mode 100644 (file)
index 0000000..a48697f
--- /dev/null
+++ b/Documentation/git-merge.txt
@@ -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
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 567d41a..aabc774 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -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.
The core git plumbing