From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: base
Date: Sun, 22 Aug 2010 09:20:29 -0400
Message-ID: <E1OnATN-00066X-0m@fencepost.gnu.org>
References: <20100822120642.GA1794@muc.de> <87bp8uzu9d.fsf@mithlond.arda>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: lo.gmane.org
X-Trace: dough.gmane.org 1282483242 19717 80.91.229.12 (22 Aug 2010 13:20:42 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Sun, 22 Aug 2010 13:20:42 +0000 (UTC)
Cc: acm@muc.de, emacs-devel@gnu.org
To: Teemu Likonen <tlikonen@iki.fi>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Aug 22 15:20:41 2010
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Envelope-to: ged-emacs-devel@m.gmane.org
Original-Received: from lists.gnu.org ([199.232.76.165])
	by lo.gmane.org with esmtp (Exim 4.69)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1OnATY-00065l-J9
	for ged-emacs-devel@m.gmane.org; Sun, 22 Aug 2010 15:20:41 +0200
Original-Received: from localhost ([127.0.0.1]:46302 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1OnATT-0008Na-6P
	for ged-emacs-devel@m.gmane.org; Sun, 22 Aug 2010 09:20:35 -0400
Original-Received: from [199.232.76.173] (port=42789 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OnATP-0008NC-ET
	for emacs-devel@gnu.org; Sun, 22 Aug 2010 09:20:31 -0400
Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <eliz@gnu.org>) id 1OnATO-0006Qh-36
	for emacs-devel@gnu.org; Sun, 22 Aug 2010 09:20:31 -0400
Original-Received: from fencepost.gnu.org ([140.186.70.10]:33115)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <eliz@gnu.org>) id 1OnATN-0006Qc-TC
	for emacs-devel@gnu.org; Sun, 22 Aug 2010 09:20:29 -0400
Original-Received: from eliz by fencepost.gnu.org with local (Exim 4.69)
	(envelope-from <eliz@gnu.org>)
	id 1OnATN-00066X-0m; Sun, 22 Aug 2010 09:20:29 -0400
In-reply-to: <87bp8uzu9d.fsf@mithlond.arda> (message from Teemu Likonen on
	Sun, 22 Aug 2010 15:50:22 +0300)
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3)
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:129035
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/129035>

> From: Teemu Likonen <tlikonen@iki.fi>
> Date: Sun, 22 Aug 2010 15:50:22 +0300
> Cc: emacs-devel@gnu.org
> 
> * 2010-08-22 12:06 (UTC), Alan Mackenzie wrote:
> 
> > Would somebody please tell me exactly what "rebase" means.
> 
> Here's a pretty good illustrated explanation:
> 
>     http://book.git-scm.com/4_rebasing.html

The bzr docs include a section on rebasing as well:

  http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/adv_merging.html

(look near the end).