From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Achim Gratz Newsgroups: gmane.emacs.devel Subject: Re: Cluttering the git tree Date: Thu, 20 Nov 2014 19:27:46 +0100 Organization: Linux Private Site Message-ID: <87lhn5d8wt.fsf@Gertrud.fritz.box> References: <87h9xx360i.fsf@web.de> <87r3wyzcor.fsf@olgas.newt.com> <87k32pzs42.fsf@web.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416508106 30684 80.91.229.3 (20 Nov 2014 18:28:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 20 Nov 2014 18:28:26 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 20 19:28:20 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 1XrWSp-0000aU-78 for ged-emacs-devel@m.gmane.org; Thu, 20 Nov 2014 19:28:19 +0100 Original-Received: from localhost ([::1]:36818 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrWSo-0001Dc-PG for ged-emacs-devel@m.gmane.org; Thu, 20 Nov 2014 13:28:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrWSb-0001D2-Nl for emacs-devel@gnu.org; Thu, 20 Nov 2014 13:28:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XrWSV-00059l-Fg for emacs-devel@gnu.org; Thu, 20 Nov 2014 13:28:05 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:60043) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrWSV-00059f-8b for emacs-devel@gnu.org; Thu, 20 Nov 2014 13:27:59 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XrWST-0000QW-Qg for emacs-devel@gnu.org; Thu, 20 Nov 2014 19:27:57 +0100 Original-Received: from pd9eb04fd.dip0.t-ipconnect.de ([217.235.4.253]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 20 Nov 2014 19:27:57 +0100 Original-Received: from Stromeko by pd9eb04fd.dip0.t-ipconnect.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 20 Nov 2014 19:27:57 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 38 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: pd9eb04fd.dip0.t-ipconnect.de User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:sPhJNfHTYeJBXMhCOAxk4MPp8y8= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:177887 Archived-At: Ulf Jasper writes: >> Another idea is to put your intermediate commits into a new branch and >> then merge them into master with git merge --squash. > > That is, what I was looking for. Thank you, Bill! No, that's a terrible idea, please forget it immediately. > This is how I (will) work: I am not changing files on the master branch > but on a temporary branch, while keeping the master branch synced with > the public repository, like so: > > a - b - c - d master > \ > x - y - z temporary > > I am doing commits on the temporary branch so that I can easily switch > branches. Once I have finished working on the temporary thing I merge > the *results* of that work into the master branch > > git checkout master > git merge --squash temporary Presumably there was some logic for you to do x, y and z in that order. If you squash, that gets lost to anyone reading the change. If you want to present a different logic now that you've implemented everything you should maybe rewrite your branch to t-u-v-w, but certainly not squash it. Unless it really is a trivial thing that should have been a single commit all along. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ SD adaptations for KORG EX-800 and Poly-800MkII V0.9: http://Synth.Stromeko.net/Downloads.html#KorgSDada