1git-merge(1) 2============ 3v0.99.6, Sep 2005 4 5NAME 6---- 7git-merge - Grand Unified Merge Driver 8 9 10SYNOPSIS 11-------- 12'git-merge' [-n] [-s <strategy>]... <msg> <head> <remote> <remote>... 13 14 15DESCRIPTION 16----------- 17This is the top-level user interface to the merge machinery 18which drives multiple merge strategy scripts. 19 20 21OPTIONS 22------- 23-n:: 24 Do not show diffstat at the end of the merge. 25 26-s <strategy>:: 27 use that merge strategy; can be given more than once to 28 specify them in the order they should be tried. If 29 there is no `-s` option, built-in list of strategies is 30 used instead. 31 32<head>:: 33 our branch head commit. 34 35<remote>:: 36 other branch head merged into our branch. You need at 37 least one <remote>. Specifying more than one <remote> 38 obviously means you are trying an Octopus. 39 40 41Author 42------ 43Written by Junio C Hamano <junkio@cox.net> 44 45 46Documentation 47-------------- 48Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. 49 50GIT 51--- 52Part of the gitlink:git[7] suite