git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Raible <raible@nextest.com>
To: <git@vger.kernel.org>
Cc: <weigelt@metux.de>
Subject: Re: Re: Really beginner on Version Control
Date: Fri, 24 Sep 2010 12:33:19 -0700	[thread overview]
Message-ID: <4C9CFCFF.8070102@nextest.com> (raw)
In-Reply-To: <20100921145922.GA14711@nibiru.local>

On 11:59 AM, Enrico Weigelt wrote:
> * FernandoBasso <FernandoBasso.br@gmail.com> wrote:
> (use the -ff option on merge if it should show up in history
> as merge instead of sequential additions - see "fast forward").

Didn't you mean --no-ff?

  reply	other threads:[~2010-09-24 19:33 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-21 14:42 Really beginner on Version Control FernandoBasso
2010-09-21 14:59 ` Thomas Moulard
2010-09-21 14:59 ` Enrico Weigelt
2010-09-24 19:33   ` Eric Raible [this message]
2010-09-24 20:18     ` Enrico Weigelt
2010-09-24 21:25     ` FernandoBasso
2010-09-21 16:40 ` Andreas Ericsson
2010-09-21 23:35 ` Jakub Narebski
2010-09-22  0:13   ` FernandoBasso
2010-09-22  3:52     ` Andrew Keller
2010-09-22 11:45       ` FernandoBasso
2010-09-22 11:49         ` FernandoBasso
2010-09-22 12:50           ` Tor Arntsen
2010-09-22 22:15         ` Dmitry Potapov
2010-09-22  7:31     ` Thomas Hochstein
2010-09-22 22:13     ` Dmitry Potapov
2010-09-22 22:10 ` Dmitry Potapov

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=4C9CFCFF.8070102@nextest.com \
    --to=raible@nextest.com \
    --cc=git@vger.kernel.org \
    --cc=weigelt@metux.de \
    /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).