Fix typo in http-push.c
[git/git.git] / Documentation / git-merge.txt
CommitLineData
0f69be53
JH
1git-merge(1)
2============
0f69be53
JH
3
4NAME
5----
6git-merge - Grand Unified Merge Driver
7
8
9SYNOPSIS
10--------
37465016 11'git-merge' [-n] [--no-commit] [-s <strategy>]... <msg> <head> <remote> <remote>...
0f69be53
JH
12
13
14DESCRIPTION
15-----------
16This is the top-level user interface to the merge machinery
17which drives multiple merge strategy scripts.
18
19
20OPTIONS
21-------
93d69d86 22include::merge-options.txt[]
0f69be53 23
3c64314c
PB
24<msg>::
25 The commit message to be used for the merge commit (in case
26 it is created). The `git-fmt-merge-msg` script can be used
27 to give a good default for automated `git-merge` invocations.
28
0f69be53
JH
29<head>::
30 our branch head commit.
31
32<remote>::
33 other branch head merged into our branch. You need at
34 least one <remote>. Specifying more than one <remote>
35 obviously means you are trying an Octopus.
36
bb73d73c
JL
37include::merge-strategies.txt[]
38
0f69be53 39
3c64314c
PB
40SEE ALSO
41--------
fdd08979 42gitlink:git-fmt-merge-msg[1], gitlink:git-pull[1]
3c64314c
PB
43
44
0f69be53
JH
45Author
46------
47Written by Junio C Hamano <junkio@cox.net>
48
49
50Documentation
51--------------
52Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
53
54GIT
55---
a7154e91 56Part of the gitlink:git[7] suite