From: Noam Postavsky <npostavs@users.sourceforge.net>
To: Kaushal Modi <kaushal.modi@gmail.com>
Cc: Emacs developers <emacs-devel@gnu.org>
Subject: Re: Trouble merging line-numbers branch into master
Date: Fri, 7 Jul 2017 11:51:51 -0400 [thread overview]
Message-ID: <CAM-tV-96_W9=yas4h_=v=HF+d-ENkLJMrhcuMLrSRzCP7+_XwA@mail.gmail.com> (raw)
In-Reply-To: <CAFyQvY0N4UuNfPQW48JgFb8nt_2pFz80u_h_mHATYKiYCg7AqA@mail.gmail.com>
On Fri, Jul 7, 2017 at 11:43 AM, Kaushal Modi <kaushal.modi@gmail.com> wrote:
> Also, shouldn't that commit have been blocked in the first place instead of complaining about it when merging?
If you rerun './autogen git' in a checkout which includes [1:
e20ad44], the git hook should be updated such that it won't complain
about changes from merged commits anymore.
1: 2017-04-29 11:42:13 -0700 e20ad449deefa7470386bf99e05fd8c67227f678
Allow bypassing of some checks when merging
next prev parent reply other threads:[~2017-07-07 15:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-07 15:43 Trouble merging line-numbers branch into master Kaushal Modi
2017-07-07 15:51 ` Noam Postavsky [this message]
2017-07-07 18:08 ` Kaushal Modi
2017-07-07 21:23 ` Alan Mackenzie
2017-07-07 21:38 ` Stefan Monnier
2017-07-07 21:41 ` Paul Eggert
2017-07-07 21:46 ` Kaushal Modi
2017-07-08 8:04 ` Eli Zaretskii
2017-07-08 12:05 ` Noam Postavsky
2017-07-08 12:46 ` Kaushal Modi
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAM-tV-96_W9=yas4h_=v=HF+d-ENkLJMrhcuMLrSRzCP7+_XwA@mail.gmail.com' \
--to=npostavs@users.sourceforge.net \
--cc=emacs-devel@gnu.org \
--cc=kaushal.modi@gmail.com \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.