X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=0f79665ea6e6bf1ffd4ff67f7aee2fcbddec0555;hb=ae41098714898acd52dba291e476a2fedbd2eae2;hp=bebf30ad3db951c0a0bad01ebee619821781eb39;hpb=fc93dbbfc91d5214b03101e057ba16f329763ef9;p=git.git diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index bebf30ad3..0f79665ea 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -8,12 +8,13 @@ git-merge - Grand Unified Merge Driver SYNOPSIS -------- -'git-merge' [-n] [--no-commit] [-s ]... ... - +[verse] +'git-merge' [-n] [--no-commit] [--squash] [-s ]... + -m= ... 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,10 +28,11 @@ include::merge-options.txt[] to give a good default for automated `git-merge` invocations. :: - our branch head commit. + Our branch head commit. This has to be `HEAD`, so new + syntax does not require it :: - other branch head merged into our branch. You need at + Other branch head merged into our branch. You need at least one . Specifying more than one obviously means you are trying an Octopus.