1git-merge(1) 2============ 3 4NAME 5---- 6git-merge - Grand Unified Merge Driver 7 8 9SYNOPSIS 10-------- 11'git-merge' [-n] [--no-commit] [-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------- 22include::merge-options.txt[] 23 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 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 37include::merge-strategies.txt[] 38 39 40SEE ALSO 41-------- 42gitlink:git-fmt-merge-msg[1], gitlink:git-pull[1] 43 44 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--- 56Part of the gitlink:git[7] suite