git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ping Yin <pkufranky@gmail.com>
To: Sverre Hvammen Johansen <hvammen@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [RFC/PATCH Second draft] Fast forward strategies allow, never, and only
Date: Tue, 18 Mar 2008 21:57:04 +0800	[thread overview]
Message-ID: <20080318135704.GA11922@kooxoo235> (raw)
In-Reply-To: <402c10cd0803172127u480276c9s4f9d716b4912ad5e@mail.gmail.com>

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

> 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"?

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

  reply	other threads:[~2008-03-18 13:57 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-11  2:59 [RFC/PATCH] Fast forward strategies allow, never, and only Sverre Hvammen Johansen
2008-03-11  3:18 ` Sverre Hvammen Johansen
2008-03-11  5:17   ` Ping Yin
2008-03-11  6:19 ` Junio C Hamano
2008-03-12  5:46   ` Sverre Hvammen Johansen
2008-03-16  6:44     ` Sverre Hvammen Johansen
2008-03-14  2:35   ` Sverre Hvammen Johansen
2008-03-11  9:15 ` Jakub Narebski
2008-03-12  4:24   ` Sverre Hvammen Johansen
2008-03-12  4:50     ` Junio C Hamano
2008-03-12  5:51       ` Sverre Hvammen Johansen
2008-03-18  4:27 ` [RFC/PATCH Second draft] " Sverre Hvammen Johansen
2008-03-18 13:57   ` Ping Yin [this message]
2008-03-18 15:58     ` Sverre Hvammen Johansen
2008-03-18 14:12   ` Jon Loeliger
2008-03-18 16:27   ` Jakub Narebski
2008-03-19  6:20     ` Sverre Hvammen Johansen
2008-03-19 21:20       ` Jakub Narebski
2008-03-20  4:44         ` Sverre Hvammen Johansen
2008-03-19 20:35   ` Junio C Hamano
2008-03-20  6:47     ` Sverre Hvammen Johansen
2008-03-22 19:49       ` Junio C Hamano
2008-03-26  3:50         ` Sverre Hvammen Johansen
2008-03-31  4:19           ` Sverre Hvammen Johansen
2008-04-20  1:06             ` [PATCH] " Sverre Hvammen Johansen
2008-04-22  7:48               ` Junio C Hamano
2008-04-24  5:39                 ` [PATCH 0/5] " Sverre Hvammen Johansen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080318135704.GA11922@kooxoo235 \
    --to=pkufranky@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=hvammen@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).