Remove git-findtags.perl
[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--------
11'git-merge' [-n] [-s <strategy>]... <msg> <head> <remote> <remote>...
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-------
22-n::
23 Do not show diffstat at the end of the merge.
24
25-s <strategy>::
26 use that merge strategy; can be given more than once to
27 specify them in the order they should be tried. If
28 there is no `-s` option, built-in list of strategies is
29 used instead.
30
31<head>::
32 our branch head commit.
33
34<remote>::
35 other branch head merged into our branch. You need at
36 least one <remote>. Specifying more than one <remote>
37 obviously means you are trying an Octopus.
38
39
40Author
41------
42Written by Junio C Hamano <junkio@cox.net>
43
44
45Documentation
46--------------
47Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
48
49GIT
50---
a7154e91 51Part of the gitlink:git[7] suite