From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel 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 Message-ID: <83shkrkote.fsf@gnu.org> References: <955c464e-5833-10fd-9c02-d7edda70e488@cs.ucla.edu> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1493493802 20328 195.159.176.226 (29 Apr 2017 19:23:22 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 29 Apr 2017 19:23:22 +0000 (UTC) Cc: rudalics@gmx.at, yuri.v.khan@gmail.com, emacs-devel@gnu.org, schwab@suse.de, npostavs@users.sourceforge.net To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 29 21:23:18 2017 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 1d4Xxd-0005AJ-J9 for ged-emacs-devel@m.gmane.org; Sat, 29 Apr 2017 21:23:17 +0200 Original-Received: from localhost ([::1]:42134 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Xxj-0005rx-Cj for ged-emacs-devel@m.gmane.org; Sat, 29 Apr 2017 15:23:23 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Xr3-0000uT-La for emacs-devel@gnu.org; Sat, 29 Apr 2017 15:16:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4Xr2-0007sp-O8 for emacs-devel@gnu.org; Sat, 29 Apr 2017 15:16:29 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:34370) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Xqv-0007qV-AF; Sat, 29 Apr 2017 15:16:21 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:1494 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d4Xqu-0002XS-AQ; Sat, 29 Apr 2017 15:16:20 -0400 In-reply-to: (message from Paul Eggert on Sat, 29 Apr 2017 11:44:06 -0700) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:214422 Archived-At: > From: Paul Eggert > Date: Sat, 29 Apr 2017 11:44:06 -0700 > Cc: martin rudalics , emacs-devel , > Andreas Schwab , Yuri Khan > > 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.