From: Paul Eggert <eggert@cs.ucla.edu>
To: Alan Mackenzie <acm@muc.de>, 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 14:41:36 -0700 [thread overview]
Message-ID: <95b91e6b-c53e-c969-cda1-998803d301cc@cs.ucla.edu> (raw)
In-Reply-To: <20170707212353.GA2428@acm>
Presumably the lines in question were changed in one branch or the other (not
necessarily by messing with white space), and our git settings are suggesting
that you omit the spaces before tabs while you're futzing with those lines.
As build-aux/git-hooks/pre-commit suggests, you can work around the problem
temporarily with the shell command 'git config core.whitespace -trailing-space'.
I don't recommend this setting in general, though.
next prev parent reply other threads:[~2017-07-07 21:41 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
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 [this message]
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=95b91e6b-c53e-c969-cda1-998803d301cc@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=acm@muc.de \
--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.