From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Random832 Newsgroups: gmane.emacs.devel Subject: Re: Branches are Scary Date: Fri, 18 Dec 2015 10:48:48 -0500 Message-ID: <87d1u3pxjz.fsf@fastmail.com> References: <87bn9oydgw.fsf@russet.org.uk> <874mfgn3t7.fsf@acer.localhost.com> <8737v0yay1.fsf@russet.org.uk> <83fuz0xlk9.fsf@gnu.org> <838u4sxh2e.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1450453887 11254 80.91.229.3 (18 Dec 2015 15:51:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 18 Dec 2015 15:51:27 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 18 16:51:15 2015 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 1a9xJL-0008B7-7A for ged-emacs-devel@m.gmane.org; Fri, 18 Dec 2015 16:51:15 +0100 Original-Received: from localhost ([::1]:33112 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9xJK-0005VJ-IK for ged-emacs-devel@m.gmane.org; Fri, 18 Dec 2015 10:51:14 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41864) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9xHF-0002jm-2d for emacs-devel@gnu.org; Fri, 18 Dec 2015 10:49:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9xHB-00061q-Q5 for emacs-devel@gnu.org; Fri, 18 Dec 2015 10:49:04 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:34416) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9xHB-00061g-JI for emacs-devel@gnu.org; Fri, 18 Dec 2015 10:49:01 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1a9xH8-0003xR-3R for emacs-devel@gnu.org; Fri, 18 Dec 2015 16:48:58 +0100 Original-Received: from c-68-39-146-59.hsd1.in.comcast.net ([68.39.146.59]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 18 Dec 2015 16:48:58 +0100 Original-Received: from random832 by c-68-39-146-59.hsd1.in.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 18 Dec 2015 16:48:58 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 14 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-68-39-146-59.hsd1.in.comcast.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) Cancel-Lock: sha1:A9kN4G5vZe6VJ/aI0EhPeS5Fkek= 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:196471 Archived-At: Eli Zaretskii writes: > So I think the too detailed history is not important for these > branches, since they eventually are going to be deleted. Therefore, > my advice is just not to squash there. If they get merged, the branch may be deleted but the history stays forever, as part of the history graph of the branch it is merged into. I suppose you could squash (and rebase, so the parent branch can be fast-forwarded) before merging, so that the merge reflects the squashed history rather than the real history that existed on the branch (and then never push the squashed version to the feature branch). Is that what you meant? Seems... fiddly, to me.