git-merge(1) ============ NAME ---- git-merge - Grand Unified Merge Driver SYNOPSIS -------- 'git-merge' [-n] [-s ]... ... 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 :: 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. :: 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. :: our branch head commit. :: other branch head merged into our branch. You need at least one . Specifying more than one obviously means you are trying an Octopus. SEE ALSO -------- gitlink:git-fmt-merge-msg[1] Author ------ Written by Junio C Hamano Documentation -------------- Documentation by Junio C Hamano and the git-list . GIT --- Part of the gitlink:git[7] suite