From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bill Wohler Newsgroups: gmane.emacs.devel Subject: Re: About git commits Date: Sun, 31 Jan 2016 12:49:36 -0800 Organization: Newt Software Message-ID: <100495.1454273376@olgas.newt.com> References: <878u37s6zl.fsf@petton.fr> <87twltjzdx.fsf@olgas.newt.com> <83io291pnl.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" X-Trace: ger.gmane.org 1454273411 7857 80.91.229.3 (31 Jan 2016 20:50:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 31 Jan 2016 20:50:11 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 31 21:50:01 2016 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 1aPywX-000783-PK for ged-emacs-devel@m.gmane.org; Sun, 31 Jan 2016 21:49:57 +0100 Original-Received: from localhost ([::1]:43192 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPywX-0000e1-6p for ged-emacs-devel@m.gmane.org; Sun, 31 Jan 2016 15:49:57 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPywL-0000ds-6r for emacs-devel@gnu.org; Sun, 31 Jan 2016 15:49:46 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aPywK-0002EU-5L for emacs-devel@gnu.org; Sun, 31 Jan 2016 15:49:45 -0500 Original-Received: from tassie.newt.com ([66.135.33.59]:53299) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPywG-0002E2-D2; Sun, 31 Jan 2016 15:49:40 -0500 Original-Received: from olgas.newt.com (c-50-161-94-13.hsd1.ca.comcast.net [50.161.94.13]) by tassie.newt.com (Postfix) with ESMTPSA id AB64668029A; Sun, 31 Jan 2016 12:49:37 -0800 (PST) Original-Received: by olgas.newt.com (Postfix, from userid 1000) id B2271380FA2; Sun, 31 Jan 2016 12:49:36 -0800 (PST) In-reply-to: <83io291pnl.fsf@gnu.org> Comments: In-reply-to Eli Zaretskii message dated "Sun, 31 Jan 2016 22:04:46 +0200." X-Mailer: MH-E 8.6+git; nmh 1.6; GNU Emacs 24.4.1 X-Image-URL: http://www.newt.com/wohler/images/bill-diving.png Mail-Followup-To: emacs-devel@gnu.org Content-ID: <100494.1454273376.1@olgas.newt.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.135.33.59 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:199098 Archived-At: Eli Zaretskii wrote: > > From: Bill Wohler > > Date: Sun, 31 Jan 2016 11:57:14 -0800 > > > > Nicolas Petton writes: > > > > > Hi guys, > > > > > > I'm preparing the pretest, and there are quite a few git commit messages > > > that refer to files without their path, I fixed like 50 of them last > > > week already, but there are more entries to be fixed. > > > > Isn't that going to screw up everybody's history? > > How can it screw up history? History is immutable. No, it is not. Log messages are fixed using git rebase -i, which rewrites all of the commits from the changed commit to HEAD. See https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History See also the section RECOVERING FROM UPSTREAM REBASE in the git rebase man page. If Nicolas used rebase on commits that had already been pushed, all of us will likely have to follow these instructions, or clone a new repository if we can. -- Bill Wohler aka http://www.newt.com/wohler/ GnuPG ID:610BD9AD