From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Cluttering the git tree Date: Tue, 18 Nov 2014 00:14:41 +0100 Message-ID: <87wq6tzafy.fsf@igel.home> References: <87h9xx360i.fsf@web.de> <87tx1xihdm.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416266130 4711 80.91.229.3 (17 Nov 2014 23:15:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 17 Nov 2014 23:15:30 +0000 (UTC) Cc: David Kastrup , emacs-devel@gnu.org To: Lars Magne Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 18 00:15:22 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 1XqVVu-0002GI-N2 for ged-emacs-devel@m.gmane.org; Tue, 18 Nov 2014 00:15:18 +0100 Original-Received: from localhost ([::1]:50637 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqVVu-0000yh-8M for ged-emacs-devel@m.gmane.org; Mon, 17 Nov 2014 18:15:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:32973) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqVVc-0000ww-4r for emacs-devel@gnu.org; Mon, 17 Nov 2014 18:15:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqVVW-00042D-Pc for emacs-devel@gnu.org; Mon, 17 Nov 2014 18:15:00 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:50924) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqVVP-0003wU-MD; Mon, 17 Nov 2014 18:14:47 -0500 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3jhR2G0zKHz3hjMb; Tue, 18 Nov 2014 00:14:45 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3jhR2F5Xdmzvh1r; Tue, 18 Nov 2014 00:14:45 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id HLeiZEI9IyAk; Tue, 18 Nov 2014 00:14:41 +0100 (CET) X-Auth-Info: 6Nu6kqB078naaB5t7O7lnJa7T/OUS2oQVwitkXh16lBxR5TQ/mc9HNBd0B1M555U Original-Received: from igel.home (ppp-188-174-153-115.dynamic.mnet-online.de [188.174.153.115]) by mail.mnet-online.de (Postfix) with ESMTPA; Tue, 18 Nov 2014 00:14:41 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id A0A6A2C3954; Tue, 18 Nov 2014 00:14:41 +0100 (CET) X-Yow: I'm DESPONDENT... I hope there's something DEEP-FRIED under this miniature DOMED STADIUM... In-Reply-To: (Lars Magne Ingebrigtsen's message of "Mon, 17 Nov 2014 23:53:55 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 212.18.0.9 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:177502 Archived-At: Lars Magne Ingebrigtsen writes: > David Kastrup writes: > >> Ulf Jasper writes: >> >>> Hi all, >>> >>> I just noticed that I cluttered the git tree with my last commit. All >>> my intermediate commits which were supposed to be visible only to me >>> suddenly appeared in the public repository. Sorry! >>> >>> I'll study some tutorials before the next commit. Promised. >> >> The only way _not_ to have intermediate commits be visible (short of >> creating a diff and applying it as a single commit) is to prettify your >> branch before merging. git rebase -i is useful for that. > > Well, he could just say "git pull --rebase", right? That doesn't clean up the intermediate commits, it just transplants them. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."