From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Git question: when using branches, how does git treat working files when changing branches? Date: Thu, 29 Oct 2015 18:31:46 +0200 Message-ID: <83vb9p1vrh.fsf@gnu.org> References: <20151028192017.GC2538@acm.fritz.box> <87k2q6wy8p.fsf@linaro.org> <20151028223252.GD2538@acm.fritz.box> <87vb9qd2h4.fsf@wanadoo.es> <20151028235340.GE2538@acm.fritz.box> <87ziz213wx.fsf@fencepost.gnu.org> <20151029123554.GB2510@acm.fritz.box> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1446136352 21906 80.91.229.3 (29 Oct 2015 16:32:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 29 Oct 2015 16:32:32 +0000 (UTC) Cc: dak@gnu.org, emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Oct 29 17:32:17 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 1Zrq7Y-0003FL-U5 for ged-emacs-devel@m.gmane.org; Thu, 29 Oct 2015 17:32:13 +0100 Original-Received: from localhost ([::1]:45278 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zrq7Y-0002Qu-68 for ged-emacs-devel@m.gmane.org; Thu, 29 Oct 2015 12:32:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zrq7G-0002Ql-O0 for emacs-devel@gnu.org; Thu, 29 Oct 2015 12:31:55 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zrq7C-0001Bb-IN for emacs-devel@gnu.org; Thu, 29 Oct 2015 12:31:54 -0400 Original-Received: from mtaout26.012.net.il ([80.179.55.182]:50029) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zrq78-00019B-GZ; Thu, 29 Oct 2015 12:31:46 -0400 Original-Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0NWZ00O00PP1ZH00@mtaout26.012.net.il>; Thu, 29 Oct 2015 18:35:11 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NWZ00LWAQ2N6O50@mtaout26.012.net.il>; Thu, 29 Oct 2015 18:35:11 +0200 (IST) In-reply-to: <20151029123554.GB2510@acm.fritz.box> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.182 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:192913 Archived-At: > Date: Thu, 29 Oct 2015 12:35:54 +0000 > From: Alan Mackenzie > Cc: emacs-devel@gnu.org > > A commit should have a meaning. A repository filled up with commit > messages like "Commit necessitated by git before switching branches." is > not going to make thrilling reading at a later date. It is meaningful to you. If you don't want anyone else to see such log messages, you can squash these commits during the final rebase. > > No. No, no, no. Absolutely no. The commits in a distributed version > > control system are yours only. > > They aren't. The commits you make on your local branch are _only_ yours, and no one else's. > If they were mine, I could chose to expunge an arbitrary > commit from the repository, clearing both file content and the log of > dross. Commits actually belong to the repository, which imposes > stringent restrictions upon what can be done with them. But "git rebase -i" and similar features allow you to rewrite history when merging to a public branch, if you so wish. > Like I said last night, I think I'm just going to use several > repositories, each cloned from my main master, rather than several > branches within one repository. After all, I have a Terabyte of disk > space. That's your prerogative, of course, but you should know that by doing so you make your life more inconvenient than it could have been.