unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Alan Mackenzie <acm@muc.de>
To: emacs-devel@gnu.org
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	[thread overview]
Message-ID: <20181003124943.GA16238@ACM> (raw)

Hello, Emacs.

Yet another git problem.

I did git revert -e <hash-1> <hash-2>, 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).



             reply	other threads:[~2018-10-03 12:49 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-03 12:49 Alan Mackenzie [this message]
2018-10-03 13:46 ` git problems: >78 column commit message created by git revert. I'm stuck. What do I do? Stefan Monnier
2018-10-03 23:41 ` Noam Postavsky
2018-10-06  9:17   ` Alan Mackenzie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181003124943.GA16238@ACM \
    --to=acm@muc.de \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).