All of lore.kernel.org
 help / color / mirror / Atom feed
From: "J. Bruce Fields" <bfields@fieldses.org>
To: Petr Baudis <pasky@suse.cz>
Cc: git@vger.kernel.org
Subject: Re: Git BOF notes
Date: Fri, 21 Jul 2006 09:21:11 -0400	[thread overview]
Message-ID: <20060721132111.GD32585@fieldses.org> (raw)
In-Reply-To: <20060719230155.GJ13776@pasky.or.cz>

On Thu, Jul 20, 2006 at 01:01:55AM +0200, Petr Baudis wrote:
> 	* Support for distributing and following the mutated history.
> 	  I'm actually not sure about the level of Git support for
> 	  this, Cogito supports cg-updating to a mutated history
> 	  if you have no local changes.

A fetch that doesn't fast-forward fails with a warning unless you
explicitly ask it (--force) to blow away your old history.

I don't see what more you could do.

--b.

  parent reply	other threads:[~2006-07-21 13:21 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-07-19 23:01 Git BOF notes Petr Baudis
2006-07-21 13:18 ` J. Bruce Fields
2006-07-21 14:42   ` Petr Baudis
2006-07-22  0:17     ` Johannes Schindelin
2006-07-22  3:22       ` Petr Baudis
2006-07-22  3:55         ` Johannes Schindelin
2006-07-22 19:16           ` Petr Baudis
2006-07-22 20:03             ` Timo Hirvonen
2006-07-23 22:53             ` Johannes Schindelin
2006-07-21 13:21 ` J. Bruce Fields [this message]
2006-07-21 14:31   ` Petr Baudis
2006-07-21 15:02     ` Alex Riesen
2006-07-22 20:12       ` Nguyễn Thái Ngọc Duy
2006-07-23  7:38         ` Alex Riesen
2006-07-24  9:06 ` Catalin Marinas
2006-07-24 11:47   ` Petr Baudis
2006-07-24 12:08     ` Nguyễn Thái Ngọc Duy

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=20060721132111.GD32585@fieldses.org \
    --to=bfields@fieldses.org \
    --cc=git@vger.kernel.org \
    --cc=pasky@suse.cz \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.