From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Yuri Khan Newsgroups: gmane.emacs.devel Subject: Re: master has switched from Automake to GNU Make Date: Tue, 11 Apr 2017 22:13:36 +0700 Message-ID: References: <58CB9F6B.5080806@gmx.at> <83h92sz2j9.fsf@gnu.org> <58CBAEB7.5030601@gmx.at> <58CBBC6C.8000104@gmx.at> <58D380FF.1070103@gmx.at> <58D3C84E.5080808@gmx.at> <58D4E0D6.2070101@gmx.at> <86mvcap85t.fsf@stephe-leake.org> <58D637CD.1020902@gmx.at> <60eced11-9b48-f24d-88d7-cacb211418c9@cs.ucla.edu> <58ECB63C.30003@gmx.at> <58ECDFE6.1060903@gmx.at> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1491923648 3975 195.159.176.226 (11 Apr 2017 15:14:08 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 11 Apr 2017 15:14:08 +0000 (UTC) Cc: Andreas Schwab , Paul Eggert , emacs-devel To: martin rudalics Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 11 17:14:02 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 1cxxUY-0000q4-F7 for ged-emacs-devel@m.gmane.org; Tue, 11 Apr 2017 17:14:02 +0200 Original-Received: from localhost ([::1]:39717 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxxUe-0001Go-Bx for ged-emacs-devel@m.gmane.org; Tue, 11 Apr 2017 11:14:08 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33311) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxxUW-0001Gd-99 for emacs-devel@gnu.org; Tue, 11 Apr 2017 11:14:01 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxxUU-0000JA-Qp for emacs-devel@gnu.org; Tue, 11 Apr 2017 11:14:00 -0400 Original-Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:35212) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cxxUU-0000IP-L5 for emacs-devel@gnu.org; Tue, 11 Apr 2017 11:13:58 -0400 Original-Received: by mail-wm0-x233.google.com with SMTP id w64so66449808wma.0 for ; Tue, 11 Apr 2017 08:13:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-transfer-encoding; bh=m8QM0CXVQ0Qq73cbRCGHwR7/8EnE3FvTDBlLU5fV1eg=; b=pASz8YUHoENmd5SNLhwWe3R5Fllczxm0s8NjYupKeUXMWkyA2ER/qPGtFH1ML/k7D3 r3lV/F2KuetY4dtEPrACu4KCWLr+OnFEo12AXu7ZpZf3+JRSbSZ/lGXU9rtL5rPlnKl3 epY4tSv7SVrd1Mu0mJ4iSI5yfhqknJO51khzfkxakoJIsEDDU7JTCANDG2HQZjqnBJz8 PaDckOwZ1qVx4X/U4ewMxbinHwybEkCI0kao8IiJtnsu2yoHmQWQOvk9GCIgBS6nQHAR wC+vUMLVvY4H3J9ypMVEOKBIfAjg4IAZ1DdYy4ravOFUR8TEQHlNTnW9gw3qqLpiHmF1 m3QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-transfer-encoding; bh=m8QM0CXVQ0Qq73cbRCGHwR7/8EnE3FvTDBlLU5fV1eg=; b=XJHSf/ciUSUnBC/+m39uk6DtE7wI57n6i9Nc0PG2HEo+bFCjhYhBgCaT94bmN5DgGL TPZlQo+oYU4/XIa3I9pGQvD5Tn7ygRPRyUunvxjc01zXzVZtScyr0YlNvtXKGJiNYeUw vtHCkqlJGRJQ/EfmIUayiTLCAszblfzje/AbFCkf9yASzbAPZsBtY6OJbuHLdqSVE+RZ 9aYYuLC1TGEbVPLMZFB89SzGKk7ZvGur6sDpyex3H2moBkn5cisJphc42lfOP0MCh/b3 nsc+K3MV78+BXxiuQ6buJvVPjZuw6DvneMwE5HurYk39MrEWhJdrMmDa89hXDWyp0hW2 c0ww== X-Gm-Message-State: AN3rC/43k6ZlCscHREcA+xlKV3CT7GcV64cEn30uZs/5AFFXWcSo5+3BRJWMC1D4gL6ywIoAv9UikyoNMZ/asw== X-Received: by 10.28.236.210 with SMTP id h79mr12260592wmi.92.1491923637518; Tue, 11 Apr 2017 08:13:57 -0700 (PDT) Original-Received: by 10.223.169.12 with HTTP; Tue, 11 Apr 2017 08:13:36 -0700 (PDT) In-Reply-To: <58ECDFE6.1060903@gmx.at> X-Google-Sender-Auth: xSuNEwe1fYsI0nOkUVEtfZDFX_M X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::233 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:213867 Archived-At: On Tue, Apr 11, 2017 at 8:23 PM, martin rudalics wrote: > IIRC it tells me that > > error: Terminal is dumb, but EDITOR unset > Not committing merge; use 'git commit' to complete the merge. Aha! Error messages are important. In a capable terminal, Git would start a text editor in which you could compose a commit message for the merge. Under an Emacs shell buffer, it can=E2=80=99t, so it defers to you to provide a commit message v= ia -m or -F. It tries first the $GIT_EDITOR variable; if that is not set, then the core.editor configuration setting; if that is not set either, then $VISUAL but only if the terminal is not dum= b; if it has not yet found anything, then $EDITOR; and if nothing yet, then it ultimately falls back to "vi", but again only if the terminal is not dumb. (And it detects terminal dumbness by the fact that the $TERM variable is not set or is set to the string "dumb".) As an Emacs user you=E2=80=99d probably want this: $ git config --global core.editor emacsclient or possibly 'emacsclient -t'. On Tue, Apr 11, 2017 at 8:53 PM, martin rudalics wrote: > I suppose this could also help me > with git's help which currently always redirects me to my browsers. Browsers? Oh, you=E2=80=99re on Windows. On other systems, git-help uses man(1) by default. (Seriously, I should configure my Git to show manuals in the browser.) > I have never tried to delve into git's options because I usually get lost > in its documentation. Git=E2=80=99s manual is like that, yes, unfortunately. The change of viewin= g tool is unlikely to help much with that. But seriously, find some time to read the =E2=80=98git help config=E2=80=99= page once. It=E2=80=99s full of useful options and less useful defaults (core.pager, core.editor, and merge.conflictstyle to name just a few). >> (Also, I always suggest to =E2=80=98git fetch=E2=80=99 first, see if you= r local branch >> and the upstream have diverged, and then decide consciously whether >> you want a merge, a rebase, or something else entirely. =E2=80=98git pul= l=E2=80=99 >> makes the decision for you.) > > I always want a merge. So what do you recommend? In particular what do > you recommend when there are conflicts? IIUC in that case git does not > merge anything but waits till I have resolved the conflicts and tells me > to commit them when I'm done. If, at that moment, I do commit I'm in > the same situation with SpecialCasing.txt as before. Or is there any > difference? Well, I would recommend rebasing, which would solve the SpecialCasing.txt problem because your rebased branch would start after the problematic file has been committed. But if you insist on merging, it=E2=80=99s doable, too. Then I guess you get a merge conflict, resolve it, stage the resolved files, attempt to commit, get a whitespace policy violation, say an expletive of your choice, see that the violation was not your doing, optionally confirm that by looking at the history of the problematic file in the branch you=E2=80=99re merging, then say =E2=80=9COh well=E2=80=9D and commit bypassing the check. (You can bypass the check by temporarily commenting out the last line in .git/hooks/pre-commit or uninstalling that hook altogether.)