.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-MERGE" "1" "10/03/2006" "" ""
+.TH "GIT\-MERGE" "1" "11/27/2006" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "NAME"
git\-merge \- Grand Unified Merge Driver
.SH "SYNOPSIS"
-\fIgit\-merge\fR [\-n] [\-\-no\-commit] [\-s <strategy>]\&... <msg> <head> <remote> <remote>\&...
.sp
+.nf
+\fIgit\-merge\fR [\-n] [\-\-no\-commit] [\-\-squash] [\-s <strategy>]\&...
+ [\-\-reflog\-action=<action>]
+ \-m=<msg> <remote> <remote>\&...
+.fi
.SH "DESCRIPTION"
-This is the top\-level user interface to the merge machinery which drives multiple merge strategy scripts.
+This is the top\-level interface to the merge machinery which drives multiple merge strategy scripts.
.sp
.SH "OPTIONS"
.TP
invocations.
.TP
<head>
-our branch head commit.
+Our branch head commit. This has to be
+HEAD, so new syntax does not require it
.TP
<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.
+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.
+.TP
+\-\-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.
.SH "MERGE STRATEGIES"
.TP
resolve
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-SHORTLOG" "1" "10/12/2006" "" ""
+.TH "GIT\-SHORTLOG" "1" "11/27/2006" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "NAME"
git\-shortlog \- Summarize 'git log' output
.SH "SYNOPSIS"
-git\-log \-\-pretty=short | \fIgit\-shortlog\fR [\-h] [\-n] [\-s]
+git\-log \-\-pretty=short | \fIgit\-shortlog\fR [\-h] [\-n] [\-s] git\-shortlog [\-n|\-\-number] [\-s|\-\-summary] [<committish>\&...]
.sp
.SH "DESCRIPTION"
Summarizes \fIgit log\fR output in a format suitable for inclusion in release announcements. Each commit will be grouped by author and the first line of the commit message will be shown.