From: "Alfred M. Szmidt" <ams@gnu.org>
To: martin rudalics <rudalics@gmx.at>
Cc: schwab@linux-m68k.org, emacs-devel@gnu.org
Subject: Re: tabs, git diff and git apply
Date: Sat, 28 Nov 2020 13:52:34 -0500 [thread overview]
Message-ID: <E1kj5Kk-0006Bs-UA@fencepost.gnu.org> (raw)
In-Reply-To: <00241b08-688c-ad95-382f-91d1020531fa@gmx.at> (message from martin rudalics on Sat, 28 Nov 2020 19:23:05 +0100)
> How was master..changes-2020-11-28.diff created?
With
git diff master..changes | tee
where "changes" is the name of the branch that contains my changes. It
would be nice to add an option to warn me about uncommitted changes ...
If you do that again, do you get the same type of diff? Does `git
diff` have a configuration that is doing context diffs?
This seems to be an issue with `git diff` rather than with emacs?
next prev parent reply other threads:[~2020-11-28 18:52 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-28 9:29 tabs, git diff and git apply martin rudalics
2020-11-28 9:39 ` Andreas Schwab
2020-11-28 10:15 ` martin rudalics
2020-11-28 10:23 ` Andreas Schwab
2020-11-28 10:28 ` martin rudalics
2020-11-28 12:08 ` Andreas Schwab
2020-11-28 12:45 ` martin rudalics
2020-11-28 13:34 ` Andreas Schwab
2020-11-28 14:20 ` martin rudalics
2020-11-28 17:27 ` Alfred M. Szmidt
2020-11-28 18:23 ` martin rudalics
2020-11-28 18:52 ` Alfred M. Szmidt [this message]
2020-11-29 8:21 ` martin rudalics
2020-11-29 9:13 ` Alfred M. Szmidt
2020-11-29 9:52 ` martin rudalics
2020-11-29 9:56 ` Yuri Khan
2020-11-28 14:40 ` Stefan Monnier
2020-11-28 15:45 ` martin rudalics
2020-11-28 16:47 ` Stefan Monnier
2020-11-28 18:22 ` martin rudalics
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=E1kj5Kk-0006Bs-UA@fencepost.gnu.org \
--to=ams@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=rudalics@gmx.at \
--cc=schwab@linux-m68k.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).