![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2276aa6)
raw | patch | inline | side by side (parent: 2276aa6)
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 9 Sep 2005 08:15:47 +0000 (01:15 -0700) | ||
| committer | Junio 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>
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
--- /dev/null
@@ -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 567d41a6bfb2aad4b852b86abd49511fed5ac6a1..aabc774961e90963562d92fe7fc0f299802483d3 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
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.