@matheusbsbs / matheus-bagliano / commits / 0f69be5376
Fork 0

'git-merge': Documentation.

... and add link from git.txt, as usual. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Sep 9, 2005 at 01:15 UTC 0f69be537618036c45bc07919248b88afbf7af3e
2 files changed +55
Documentation/git-merge.txt new
+52
@@ -0,0 +1,52 @@
1 +git-merge(1)
2 +============
3 +v0.99.6, Sep 2005
4 +
5 +NAME
6 +----
7 +git-merge - Grand Unified Merge Driver
8 +
9 +
10 +SYNOPSIS
11 +--------
12 +'git-merge' [-n] [-s <strategy>]... <msg> <head> <remote> <remote>...
13 +
14 +
15 +DESCRIPTION
16 +-----------
17 +This is the top-level user interface to the merge machinery
18 +which drives multiple merge strategy scripts.
19 +
20 +
21 +OPTIONS
22 +-------
23 +-n::
24 + Do not show diffstat at the end of the merge.
25 +
26 +-s <strategy>::
27 + use that merge strategy; can be given more than once to
28 + specify them in the order they should be tried. If
29 + there is no `-s` option, built-in list of strategies is
30 + used instead.
31 +
32 +<head>::
33 + our branch head commit.
34 +
35 +<remote>::
36 + other branch head merged into our branch. You need at
37 + least one <remote>. Specifying more than one <remote>
38 + obviously means you are trying an Octopus.
39 +
40 +
41 +Author
42 +------
43 +Written by Junio C Hamano <junkio@cox.net>
44 +
45 +
46 +Documentation
47 +--------------
48 +Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
49 +
50 +GIT
51 +---
52 +Part of the link:git.html[git] suite
Documentation/git.txt
+3
@@ -257,6 +257,9 @@ link:git-ls-remote.html[git-ls-remote]::
257 Shows references in a remote or local repository.
258 Previously this command was known as git-ls-remote-script.
259
260 +link:git-merge.html[git-merge]::
261 + Grand unified merge driver.
262 +
263 link:git-octopus.html[git-octopus]::
264 Merge more than two commits.
265 Previously this command was known as git-octopus-script.