Re: [RFC/PATCH Second draft] Fast forward strategies allow, never, and only

From: Jon Loeliger <jdl@freescale.com>
Date: Mar 18, 2008, 14:12 UTC
Message-ID: <47DFCDBC.2010400@freescale.com>
In-Reply-To: <402c10cd0803172127u480276c9s4f9d716b4912ad5e@mail.gmail.com>

Sverre Hvammen Johansen wrote:

Show 10 quoted lines

> diff --git a/Documentation/fast-forward-options.txt
> b/Documentation/fast-forward-options.txt
> new file mode 100644
> index 0000000..87fd0ae
> --- /dev/null
> +++ b/Documentation/fast-forward-options.txt
> @@ -0,0 +1,69 @@
> +FAST FORWARD OPTIONS
> +--------------------
>

Show 7 quoted lines

> +
> +However, if your workflow require a linear history for the special
> +branch ("master"), topic branches must be rebased before merging them
> +back to "master".  A pull or a merge from the "master branch of a
> +topic branch may accidentally introduce a merge commit that was not
> +already in the topic branch if the topic that were merged was not
> +properly rebased.  This will creating a none linear history.

s/none /non/

jdl