From: Junio C Hamano Date: Fri, 9 Sep 2005 08:15:47 +0000 (-0700) Subject: 'git-merge': Documentation. X-Git-Tag: v0.99.7~81 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=0f69be537618036c45bc07919248b88afbf7af3e;p=git.git 'git-merge': Documentation. ... and add link from git.txt, as usual. Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt new file mode 100644 index 00000000..a48697ff --- /dev/null +++ b/Documentation/git-merge.txt @@ -0,0 +1,52 @@ +git-merge(1) +============ +v0.99.6, Sep 2005 + +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. + +:: + 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. + + +Author +------ +Written by Junio C Hamano + + +Documentation +-------------- +Documentation by Junio C Hamano and the git-list . + +GIT +--- +Part of the link:git.html[git] suite diff --git a/Documentation/git.txt b/Documentation/git.txt index 567d41a6..aabc7749 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -257,6 +257,9 @@ link:git-ls-remote.html[git-ls-remote]:: Shows references in a remote or local repository. Previously this command was known as git-ls-remote-script. +link:git-merge.html[git-merge]:: + Grand unified merge driver. + link:git-octopus.html[git-octopus]:: Merge more than two commits. Previously this command was known as git-octopus-script.