From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: base Date: Sun, 22 Aug 2010 12:06:42 +0000 Message-ID: <20100822120642.GA1794@muc.de> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1282479200 7840 80.91.229.12 (22 Aug 2010 12:13:20 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 22 Aug 2010 12:13:20 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Aug 22 14:13:18 2010 Return-path: 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 ) id 1On9QK-0005OW-Or for ged-emacs-devel@m.gmane.org; Sun, 22 Aug 2010 14:13:16 +0200 Original-Received: from localhost ([127.0.0.1]:37616 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1On9QJ-0001Il-UA for ged-emacs-devel@m.gmane.org; Sun, 22 Aug 2010 08:13:15 -0400 Original-Received: from [140.186.70.92] (port=35965 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1On9Pe-0000pK-IY for emacs-devel@gnu.org; Sun, 22 Aug 2010 08:12:38 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1On9F8-0005uE-2t for emacs-devel@gnu.org; Sun, 22 Aug 2010 08:01:43 -0400 Original-Received: from colin.muc.de ([193.149.48.1]:2749 helo=mail.muc.de) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1On9F7-0005tP-Tk for emacs-devel@gnu.org; Sun, 22 Aug 2010 08:01:42 -0400 Original-Received: (qmail 41660 invoked by uid 3782); 22 Aug 2010 11:54:59 -0000 Original-Received: from acm.muc.de (pD9E50EC8.dip.t-dialin.net [217.229.14.200]) by colin2.muc.de (tmda-ofmipd) with ESMTP; Sun, 22 Aug 2010 13:54:58 +0200 Original-Received: (qmail 1997 invoked by uid 1000); 22 Aug 2010 12:06:42 -0000 Content-Disposition: inline User-Agent: Mutt/1.5.9i X-Delivery-Agent: TMDA/1.1.5 (Fettercairn) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 4.6-4.9 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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:129028 Archived-At: Hi, Emacs! Both here and in other contexts I keep reading the term "rebase". I don't think I had heard it at all a few months back. Would somebody please tell me exactly what "rebase" means. I have an idea that it means this; when working on a branch, sometimes the upstream is enhanced; to "rebase" is getting the enhancements into the branch one is working in, together with all the administrivia. Thanks in advance! -- Alan Mackenzie (Nuremberg, Germany).