From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-31033-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 1023 invoked by alias); 7 Feb 2013 21:35:15 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 31033
Received: (qmail 8970 invoked from network); 7 Feb 2013 21:35:05 -0000
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED,
	DKIM_SIGNED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED,RCVD_IN_DNSWL_LOW,
	T_DKIM_INVALID autolearn=no version=3.3.2
Received-SPF: pass (ns1.primenet.com.au: SPF record at _netblocks.google.com designates 209.85.223.172 as permitted sender)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=mime-version:x-received:in-reply-to:references:date:message-id
         :subject:from:to:cc:content-type;
        bh=LpIJeccwMEul+jrtmp7xdY9NwgK8kU1lDlNg2hFcW3M=;
        b=PYPqt12xA4KUxYf/sGp7ZAm52GGgOQ7Iyhd85hoeNTHyDoW+IP+ZPLw0PRv93R1dro
         KQ0YAvwaBziSN2D2iPIJyzBak957xTA+xrOn58ss3T/MNSO8ESjeUjQaUiTe15dZp2TX
         46HbjIxY7uBO2sPJjSehuOOLlPTloNOGmKLQ3UflZPywU4/Ypm70p7p5KpBX48HlRtjD
         BT8MNYlTYpyQy0c7uYoDtrvle/cOs9SkiasUQtIGNHHUZnN08yl7r7rwVe2xfBygDN2p
         kk3I4WJ12JDOvguqdTpEius+cRrZCtcMMvaIKWmwhz0us4t4k0RUzs+vml2Hk9qmVl1g
         XmTw==
MIME-Version: 1.0
X-Received: by 10.43.114.135 with SMTP id fa7mr5183201icc.21.1360272899424;
 Thu, 07 Feb 2013 13:34:59 -0800 (PST)
In-Reply-To: <1360086270-13944-3-git-send-email-themineo@gmail.com>
References: <1360086270-13944-3-git-send-email-themineo@gmail.com>
Date: Thu, 7 Feb 2013 22:34:59 +0100
Message-ID: <CAHYJk3QDV5AW0gGGkArNf=wW1HjSvrnoWSA-eXCOx_oJLQKnmg@mail.gmail.com>
Subject: Re: [PATCH 3/3] zsh-development-guide: add a missing 'to'
From: Mikael Magnusson <mikachu@gmail.com>
To: Wieland Hoffmann <themineo@gmail.com>
Cc: zsh-workers@zsh.org
Content-Type: text/plain; charset=UTF-8

This isn't true afaik... Did whoever wrote it mean git merge --squash?

On 05/02/2013, Wieland Hoffmann <themineo@gmail.com> wrote:
> ---
>  Etc/zsh-development-guide | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Etc/zsh-development-guide b/Etc/zsh-development-guide
> index e7d7385..e4ac1ba 100644
> --- a/Etc/zsh-development-guide
> +++ b/Etc/zsh-development-guide
> @@ -67,7 +67,7 @@ Git Workflow
>   * Do not merge your private feature branches onto the master branch: a
>     linear history without merge commits is simpler to follow (and to
>     bisect). Both "git cherry-pick" and "git merge --ff-only" can be used
> -   bring changes over to another branch without a merge commit.
> +   to bring changes over to another branch without a merge commit.
>
>   * It is often useful to regularly check in changes while prototyping a
>     solution on a private branch. When finished, it is better to deliver a
> --
> 1.8.1.2
>
>


-- 
Mikael Magnusson