Merge branch 'jc/skip-count'

[git.git] / Documentation / git-merge.txt
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt

index bebf30ad3db951c0a0bad01ebee619821781eb39..e2954aa76eef46101f38683eb346bd31bf711a40 100644 (file)
--- 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[]