From: Eli Zaretskii <eliz@gnu.org>
To: Paul Eggert <eggert@cs.ucla.edu>
Cc: rudalics@gmx.at, yuri.v.khan@gmail.com, emacs-devel@gnu.org,
schwab@suse.de, npostavs@users.sourceforge.net
Subject: Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make)
Date: Sat, 29 Apr 2017 22:15:41 +0300 [thread overview]
Message-ID: <83shkrkote.fsf@gnu.org> (raw)
In-Reply-To: <a4de4a86-5933-dade-9b86-3166ab043adf@cs.ucla.edu> (message from Paul Eggert on Sat, 29 Apr 2017 11:44:06 -0700)
> From: Paul Eggert <eggert@cs.ucla.edu>
> Date: Sat, 29 Apr 2017 11:44:06 -0700
> Cc: martin rudalics <rudalics@gmx.at>, emacs-devel <emacs-devel@gnu.org>,
> Andreas Schwab <schwab@suse.de>, Yuri Khan <yuri.v.khan@gmail.com>
>
> Noam Postavsky wrote:
> > Since git only runs the hooks on the merged changes when you pass
> > --no-commit to 'git merge', defaulting to non-blind merge doesn't
> > really work anyway.
>
> Thanks for looking into this. I guess I'll have to rethink how I merge.
Not sure it matters in the context of this discussion, but please keep
in mind that "git cherry-pick" also merges.
next prev parent reply other threads:[~2017-04-29 19:15 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-11 16:25 git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make) Noam Postavsky
2017-04-12 9:30 ` martin rudalics
2017-04-12 18:26 ` Paul Eggert
2017-04-13 0:13 ` Noam Postavsky
2017-04-13 1:49 ` Paul Eggert
2017-04-13 2:05 ` Noam Postavsky
2017-04-13 6:11 ` Paul Eggert
2017-04-13 20:04 ` Noam Postavsky
2017-04-29 18:00 ` Noam Postavsky
2017-04-29 18:44 ` Paul Eggert
2017-04-29 19:15 ` Eli Zaretskii [this message]
2017-04-29 19:54 ` Noam Postavsky
2017-04-29 20:04 ` Eli Zaretskii
2017-04-29 23:25 ` Noam Postavsky
2017-04-30 2:34 ` Eli Zaretskii
2017-04-30 19:35 ` Noam Postavsky
2017-04-30 19:40 ` Eli Zaretskii
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=83shkrkote.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
--cc=npostavs@users.sourceforge.net \
--cc=rudalics@gmx.at \
--cc=schwab@suse.de \
--cc=yuri.v.khan@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.