summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
blob: 8c9c4d87e359041b8f10b2ec5f13ee4217fae3bc (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
git-merge(1)
============
 
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.
 
<msg>::
	The commit message to be used for the merge commit (in case
	it is created). The `git-fmt-merge-msg` script can be used
	to give a good default for automated `git-merge` invocations.
 
<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.
 
 
SEE ALSO
--------
gitlink:git-fmt-merge-msg[1]
 
 
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 gitlink:git[7] suite