Re: [PATCH 3/3] zsh-development-guide: add a missing 'to'

[Mikael Magnusson <mikachu@xxxxxxxxx>]

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

On 05/02/2013, Wieland Hoffmann <themineo@xxxxxxxxx> 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