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

From: Ping Yin <pkufranky@gmail.com>
Date: Mar 18, 2008, 13:57 UTC
Message-ID: <20080318135704.GA11922@kooxoo235>
In-Reply-To: <402c10cd0803172127u480276c9s4f9d716b4912ad5e@mail.gmail.com>

* Sverre Hvammen Johansen <hvammen@gmail.com> [2008-03-17 20:27:13 -0800]:

Show 7 quoted lines

> New fast forward strategies, only, is introduced.  This new fast
> forward strategy prevents real merges.
> 
> +                               fast_forward=allow ;;
> +                       *)
> +                               die "Available fast-forward strategies
> are: allow, newer, and only" ;;

I fail to apply this patch. It seems wrapped here. Do you use "git send-email"?

Show 10 quoted lines

> +                       esac
> +                       ;;
> +               --ff=*)
> +                       fast_forward=${1#--ff=}
> +                       case "$fast_forward" in
> +                           allow|never|only)
> +                               ;;
> +                           *)
> +                               die "Available fast-forward strategies
> are: allow, newer, and only" ;;

Wrapped again.