1git-merge(1) 2============ 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<msg>:: 32 The commit message to be used for the merge commit (in case 33 it is created). The `git-fmt-merge-msg` script can be used 34 to give a good default for automated `git-merge` invocations. 35 36<head>:: 37 our branch head commit. 38 39<remote>:: 40 other branch head merged into our branch. You need at 41 least one <remote>. Specifying more than one <remote> 42 obviously means you are trying an Octopus. 43 44 45SEE ALSO 46-------- 47gitlink:git-fmt-merge-msg[1] 48 49 50Author 51------ 52Written by Junio C Hamano <junkio@cox.net> 53 54 55Documentation 56-------------- 57Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. 58 59GIT 60--- 61Part of the gitlink:git[7] suite