diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-26 22:19:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-26 22:19:56 -0800 |
| commit | 88ffc1f28a8b86969c7cbc54b0e3279d8cfe90a8 (patch) | |
| tree | 3c461861be7704f2701c69ae006d1bc1d1e74bf4 /Documentation | |
| parent | d63afe9ebb9b27952d3c29215a246b252f2d80f9 (diff) | |
| parent | c1751616381b6e8c8eae311107b5969a0233a6d8 (diff) | |
| download | git-88ffc1f28a8b86969c7cbc54b0e3279d8cfe90a8.tar.gz | |
Merge branch 'jc/merge'
* branch 'jc/merge':
git-merge: do not leak rev-parse output used for checking internally.
git-merge: tighten error checking.
merge: allow merging into a yet-to-be-born branch.
git-merge: make it usable as the first class UI
remove merge-recursive-old
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-merge.txt | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index bebf30ad3d..e2954aa76e 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/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[] |