From: Stefan Monnier <monnier@iro.umontreal.ca>
To: emacs-devel@gnu.org
Subject: Re: git problems: >78 column commit message created by git revert. I'm stuck. What do I do?
Date: Wed, 03 Oct 2018 09:46:54 -0400 [thread overview]
Message-ID: <jwvzhvvup1o.fsf-monnier+gmane.emacs.devel@gnu.org> (raw)
In-Reply-To: 20181003124943.GA16238@ACM
> 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. :-(
When you `git commit` you can skip the "78 char" check with `--no-verify`,
but indeed, I can't see how to do the equivalent within `git
pull --rebase` or `git rebase` (at least according to the manpage: `git
rebase` has a `--no-verify` option as well, so maybe that will work,
but the doc says it only affects the use of .git/hooks/pre-rebase).
You can rm .git/hooks/commit-msg, tho.
Also you can `git pull` without the `--rebase`.
> However, I now have two unrebaseable commits in my repo, and it seems
> likely the savannah server would reject them anyway.
Those checks are only performed locally: the savannah server will
happily accept commits that don't abide by those rules.
Stefan
next prev parent reply other threads:[~2018-10-03 13:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-03 12:49 git problems: >78 column commit message created by git revert. I'm stuck. What do I do? Alan Mackenzie
2018-10-03 13:46 ` Stefan Monnier [this message]
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=jwvzhvvup1o.fsf-monnier+gmane.emacs.devel@gnu.org \
--to=monnier@iro.umontreal.ca \
--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).