diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-09-09 01:15:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-10 18:30:42 -0700 |
| commit | 0f69be537618036c45bc07919248b88afbf7af3e (patch) | |
| tree | b9d98fbff2a5b6ec4b17656eea6321b251b9a0b9 | |
| parent | Use Daniel's read-tree in the merge strategy 'resolve'. (diff) | |
| download | tgif-0f69be537618036c45bc07919248b88afbf7af3e.tar.xz | |
'git-merge': Documentation.
... and add link from git.txt, as usual.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/git-merge.txt | 52 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 |
2 files changed, 55 insertions, 0 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt new file mode 100644 index 0000000000..a48697ff34 --- /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 <strategy>]... <msg> <head> <remote> <remote>... + + +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 <strategy>:: + 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. + +<head>:: + our branch head commit. + +<remote>:: + other branch head merged into our branch. You need at + least one <remote>. Specifying more than one <remote> + obviously means you are trying an Octopus. + + +Author +------ +Written by Junio C Hamano <junkio@cox.net> + + +Documentation +-------------- +Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. + +GIT +--- +Part of the link:git.html[git] suite diff --git a/Documentation/git.txt b/Documentation/git.txt index 567d41a6bf..aabc774961 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. |