diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-11-27 20:03:22 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-11-27 20:03:22 +0000 |
| commit | ee6d961e5ef1620587dc569854d20de06d4afbce (patch) | |
| tree | bbd4d8d36b796d5f7af72e259a656d8a5c20a5aa /git-merge.txt | |
| parent | f98fd8819b6919d5ffec3fb0490a0db6b9125632 (diff) | |
| download | git-htmldocs-ee6d961e5ef1620587dc569854d20de06d4afbce.tar.gz | |
Autogenerated HTML docs for v1.4.4.1-g3c23
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/git-merge.txt b/git-merge.txt index bebf30ad3..e2954aa76 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -8,12 +8,14 @@ git-merge - Grand Unified Merge Driver SYNOPSIS -------- -'git-merge' [-n] [--no-commit] [-s <strategy>]... <msg> <head> <remote> <remote>... - +[verse] +'git-merge' [-n] [--no-commit] [--squash] [-s <strategy>]... + [--reflog-action=<action>] + -m=<msg> <remote> <remote>... DESCRIPTION ----------- -This is the top-level user interface to the merge machinery +This is the top-level interface to the merge machinery which drives multiple merge strategy scripts. @@ -27,13 +29,19 @@ include::merge-options.txt[] to give a good default for automated `git-merge` invocations. <head>:: - our branch head commit. + Our branch head commit. This has to be `HEAD`, so new + syntax does not require it <remote>:: - other branch head merged into our branch. You need at + 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. +--reflog-action=<action>:: + This is used internally when `git-pull` calls this command + to record that the merge was created by `pull` command + in the `ref-log` entry that results from the merge. + include::merge-strategies.txt[] |