From: Sergey Organov <sorganov@gmail.com>
To: Richard Stallman <rms@gnu.org>
Cc: larsi@gnus.org, eliz@gnu.org,
David Engster <deng@randomsample.de>,
emacs-devel@gnu.org
Subject: Re: whitespace-only changes
Date: Fri, 21 Aug 2020 11:55:27 +0300 [thread overview]
Message-ID: <87o8n4l6o0.fsf@osv.gnss.ru> (raw)
In-Reply-To: <E1k8xoE-000523-ON@fencepost.gnu.org> (Richard Stallman's message of "Thu, 20 Aug 2020 23:33:42 -0400")
Richard Stallman <rms@gnu.org> writes:
> [[[ To any NSA and FBI agents reading my email: please consider ]]]
> [[[ whether defending the US Constitution against all enemies, ]]]
> [[[ foreign or domestic, requires you to follow Snowden's example. ]]]
>
> If git itself doesn't have all the facilities for ignoring trivial
> commits that we would want, we can add those facilities in various ways,
> with patches to git or scripts. We can offer the patches upstream.
Git has various options to ignore whitespace changes during merge:
ignore-space-change, ignore-all-space, ignore-space-at-eol,
ignore-cr-at-eol
Treats lines with the indicated type of whitespace change as
unchanged for the sake of a three-way merge. Whitespace changes
mixed with other changes to a line are not ignored. See also
git-diff(1) -b, -w, --ignore-space-at-eol, and
--ignore-cr-at-eol.
• If their version only introduces whitespace changes to a
line, our version is used;
• If our version introduces whitespace changes but their
version includes a substantial change, their version is
used;
• Otherwise, the merge proceeds in the usual way.
OTOH, when merging, by design Git never looks at individual commits, it
rather performs 3-way merge with respect to common ancestor, so no
marking of individual commits would help.
-- Sergey
next prev parent reply other threads:[~2020-08-21 8:55 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-20 3:06 whitespace-only changes Richard Stallman
2020-08-20 8:04 ` Mattias Engdegård
2020-08-20 13:19 ` Eli Zaretskii
2020-08-20 13:32 ` Lars Ingebrigtsen
2020-08-20 14:54 ` David Engster
2020-08-21 3:33 ` Richard Stallman
2020-08-21 8:55 ` Sergey Organov [this message]
2020-08-23 4:42 ` Richard Stallman
2020-08-20 20:50 ` Daniel Martín
2020-08-20 20:54 ` Lars Ingebrigtsen
2020-08-20 21:07 ` Daniel Martín
2020-08-21 13:13 ` Stefan Monnier
2020-08-22 3:51 ` Richard Stallman
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87o8n4l6o0.fsf@osv.gnss.ru \
--to=sorganov@gmail.com \
--cc=deng@randomsample.de \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=larsi@gnus.org \
--cc=rms@gnu.org \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).