From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: git problems: >78 column commit message created by git revert. I'm stuck. What do I do? Date: Wed, 3 Oct 2018 12:49:43 +0000 Message-ID: <20181003124943.GA16238@ACM> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: blaine.gmane.org 1538571238 28665 195.159.176.226 (3 Oct 2018 12:53:58 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 3 Oct 2018 12:53:58 +0000 (UTC) User-Agent: Mutt/1.10.1 (2018-07-13) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Oct 03 14:53:54 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g7gf0-0007KV-P7 for ged-emacs-devel@m.gmane.org; Wed, 03 Oct 2018 14:53:50 +0200 Original-Received: from localhost ([::1]:48645 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g7gh7-0002Bc-10 for ged-emacs-devel@m.gmane.org; Wed, 03 Oct 2018 08:56:01 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39167) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g7ggx-0002BM-Ot for emacs-devel@gnu.org; Wed, 03 Oct 2018 08:55:52 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g7ggu-00053E-35 for emacs-devel@gnu.org; Wed, 03 Oct 2018 08:55:51 -0400 Original-Received: from colin.muc.de ([193.149.48.1]:23079 helo=mail.muc.de) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1g7ggt-00051s-C3 for emacs-devel@gnu.org; Wed, 03 Oct 2018 08:55:47 -0400 Original-Received: (qmail 92219 invoked by uid 3782); 3 Oct 2018 12:55:44 -0000 Original-Received: from acm.muc.de (p5B147319.dip0.t-ipconnect.de [91.20.115.25]) by colin.muc.de (tmda-ofmipd) with ESMTP; Wed, 03 Oct 2018 14:55:43 +0200 Original-Received: (qmail 16707 invoked by uid 1000); 3 Oct 2018 12:49:43 -0000 Content-Disposition: inline X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 193.149.48.1 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:230196 Archived-At: Hello, Emacs. Yet another git problem. I did git revert -e , committing the results to my local git repository. I then did git pull --rebase. This failed with the message "Line longer than 78 characters in commit message". The revert operation created log messages with very long lines. :-( Then, following the suggestion in the error message, I did git rebase --abort, to get back to a stable state. However, I now have two unrebaseable commits in my repo, and it seems likely the savannah server would reject them anyway. I'd like to use git commit --amend, but this can only change one of the two commit messages created by git revert. How can I resolve this mess? -- Alan Mackenzie (Nuremberg, Germany).