From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Rob Browning Newsgroups: gmane.emacs.devel Subject: Re: Cluttering the git tree Date: Thu, 20 Nov 2014 00:18:36 -0600 Message-ID: <87oas2z96r.fsf@trouble.defaultvalue.org> References: <87h9xx360i.fsf@web.de> <87tx1xihdm.fsf@fencepost.gnu.org> <87wq6tzafy.fsf@igel.home> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416464355 24488 80.91.229.3 (20 Nov 2014 06:19:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 20 Nov 2014 06:19:15 +0000 (UTC) Cc: David Kastrup , emacs-devel@gnu.org To: Andreas Schwab , Lars Magne Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 20 07:19:08 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XrL58-0000EZ-L5 for ged-emacs-devel@m.gmane.org; Thu, 20 Nov 2014 07:19:06 +0100 Original-Received: from localhost ([::1]:33770 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrL58-0002W4-3C for ged-emacs-devel@m.gmane.org; Thu, 20 Nov 2014 01:19:06 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrL4r-0002VV-7d for emacs-devel@gnu.org; Thu, 20 Nov 2014 01:18:53 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XrL4m-0003KW-G8 for emacs-devel@gnu.org; Thu, 20 Nov 2014 01:18:49 -0500 Original-Received: from defaultvalue.org ([70.85.129.156]:56103) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrL4h-0003JZ-5n; Thu, 20 Nov 2014 01:18:39 -0500 Original-Received: from trouble.defaultvalue.org (localhost [127.0.0.1]) (Authenticated sender: rlb@defaultvalue.org) by defaultvalue.org (Postfix) with ESMTPSA id 07D852002E; Thu, 20 Nov 2014 00:18:38 -0600 (CST) Original-Received: by trouble.defaultvalue.org (Postfix, from userid 1000) id EEB4314E18D; Thu, 20 Nov 2014 00:18:36 -0600 (CST) In-Reply-To: <87wq6tzafy.fsf@igel.home> User-Agent: Notmuch/0.18.2 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 70.85.129.156 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177855 Archived-At: Andreas Schwab writes: > Lars Magne Ingebrigtsen writes: >> Well, he could just say "git pull --rebase", right? > > That doesn't clean up the intermediate commits, it just transplants > them. And in more detail, it effectively 1) runs git fetch to update the local copy of the relevant upstream branch, 2) removes all of your pending commits from the current branch, 3) moves the current branch forward to match the local upstream copy that was just fetched, 4) and then attempts to reapply all of the patches that were removed in step 2 to the updated current branch (i.e. the rebase). If anything goes wrong with a patch in step 4, you'll be walked through a resolution process (as with all rebases). And at any point, if you want to start over, you can run "git rebase --abort". Hope this helps -- Rob Browning rlb @defaultvalue.org and @debian.org GPG as of 2011-07-10 E6A9 DA3C C9FD 1FF8 C676 D2C4 C0F0 39E9 ED1B 597A GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4