From: Junio C Hamano Date: Mon, 27 Nov 2006 20:03:22 +0000 (+0000) Subject: Autogenerated HTML docs for v1.4.4.1-g3c23 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ee6d961e5ef1620587dc569854d20de06d4afbce;p=git.git Autogenerated HTML docs for v1.4.4.1-g3c23 --- diff --git a/git-merge.html b/git-merge.html index cb7d62aaa..c0bab8440 100644 --- a/git-merge.html +++ b/git-merge.html @@ -272,11 +272,14 @@ git-merge(1) Manual Page

SYNOPSIS

-

git-merge [-n] [--no-commit] [-s <strategy>]… <msg> <head> <remote> <remote>…

+
+
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.

OPTIONS

@@ -341,7 +344,8 @@ which drives multiple merge strategy scripts.

- our branch head commit. + Our branch head commit. This has to be HEAD, so new + syntax does not require it

@@ -349,11 +353,21 @@ which drives multiple merge strategy scripts.

- 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. +

+

MERGE STRATEGIES

@@ -567,7 +581,7 @@ Resolve the conflicts. git-diff would report only the 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 ]... ... - +[verse] +'git-merge' [-n] [--no-commit] [--squash] [-s ]... + [--reflog-action=] + -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,13 +29,19 @@ 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. +--reflog-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[] diff --git a/git-shortlog.html b/git-shortlog.html index 50d52c76d..c55f6250c 100644 --- a/git-shortlog.html +++ b/git-shortlog.html @@ -272,7 +272,8 @@ git-shortlog(1) Manual Page

SYNOPSIS

-

git-log --pretty=short | git-shortlog [-h] [-n] [-s]

+

git-log --pretty=short | git-shortlog [-h] [-n] [-s] +git-shortlog [-n|--number] [-s|--summary] [<committish>…]

DESCRIPTION

@@ -347,7 +348,7 @@ Eve Jones <eve@laptop.(none)>
diff --git a/git-shortlog.txt b/git-shortlog.txt index d54fc3e5c..95fa9010c 100644 --- a/git-shortlog.txt +++ b/git-shortlog.txt @@ -8,6 +8,7 @@ git-shortlog - Summarize 'git log' output SYNOPSIS -------- git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s] +git-shortlog [-n|--number] [-s|--summary] [...] DESCRIPTION -----------