On Thu, Apr 24, 2008 at 1:46 PM, Sverre Hvammen Johansen<hvammen@xxxxxxxxx> wrote:> --ff now takes an argument allowing --ff to be written> as --ff=allow and -no-ff to be written as --ff=never.> This change allow other fast forward options to be> introduced later.>> See the documentation for a further explanation of these options.>> Signed-off-by: Sverre Hvammen Johansen <hvammen@xxxxxxxxx>> ---> Documentation/fast-forward-options.txt | 44 ++++++++> Documentation/git-merge.txt | 6 +-> Documentation/git-pull.txt | 2 +> Documentation/merge-options.txt | 9 +-> git-merge.sh | 47 +++++---> git-pull.sh | 4 +-> t/t7601-merge-ff-options.sh | 188 ++++++++++++++++++++++++++++++++> 7 files changed, 277 insertions(+), 23 deletions(-)> create mode 100644 Documentation/fast-forward-options.txt>> diff --git a/Documentation/fast-forward-options.txt> b/Documentation/fast-forward-options.txt> new file mode 100644> index 0000000..95d0e6f> --- /dev/null> +++ b/Documentation/fast-forward-options.txt> @@ -0,0 +1,44 @@> +FAST FORWARD OPTIONS> +--------------------> +> +allow::> +> + Do not generate a merge commit if the merge resolves as a> + fast-forward, only update the branch pointer. This option is> + equivalent of '--ff' without any argument. This is the> + default behavior.
only and never are both adverb，but allow is a verb. So how about usingauto instead of allow?
-- Ping Yin��.n��������+%������w��{.n��������n�r������&��z�ޗ�zf���h���~����������_��+v���)ߣ�m
