From: Ted Zlatanov <tzz@lifelogs.com>
To: emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] trunk r115470: eww: exit and close actions
Date: Thu, 19 Dec 2013 20:07:20 -0500 [thread overview]
Message-ID: <87lhzggwjb.fsf@flea.lifelogs.com> (raw)
In-Reply-To: 87mwjwxsjf.fsf@uwakimon.sk.tsukuba.ac.jp
On Fri, 20 Dec 2013 09:41:40 +0900 "Stephen J. Turnbull" <stephen@xemacs.org> wrote:
SJT> Ted Zlatanov writes:
>> On Mon, 16 Dec 2013 17:30:06 -0500 Glenn Morris <rgm@gnu.org> wrote:
>>
GM> Ted Zlatanov wrote:
>> >> I don't want to brute-force it as a reverse patch.
>> I'm used to the Git workflow, where "git revert" will DTRT for this
SJT> "git revert" or "git reset"? "git revert" *exactly* applies a reverse
SJT> patch, and can be used to precisely reverse the effect of any earlier
SJT> change in one operation (assuming no conflicts). "git reset" OTOH
SJT> leaves no trace of the earlier patch -- or any changes since then, so
SJT> you need to reapply ("rebase") them.
I meant "git revert" precisely. "git reset" rewrites history, which in
a public repo is considered bad practice (no need to get into details).
Ted
next prev parent reply other threads:[~2013-12-20 1:07 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <E1Vqp1Z-0004La-IR@vcs.savannah.gnu.org>
2013-12-12 18:52 ` [Emacs-diffs] trunk r115470: eww: exit and close actions Stefan Monnier
2013-12-12 19:17 ` Ted Zlatanov
2013-12-12 22:14 ` Stefan Monnier
2013-12-13 14:36 ` Ted Zlatanov
2013-12-13 15:06 ` Stefan Monnier
2013-12-13 19:36 ` Ted Zlatanov
2013-12-14 2:07 ` Stefan Monnier
2013-12-14 17:33 ` Ted Zlatanov
2013-12-14 17:49 ` Lars Magne Ingebrigtsen
2013-12-16 0:21 ` T.V. Raman
2013-12-16 22:25 ` Ted Zlatanov
2013-12-16 22:30 ` Glenn Morris
2013-12-19 16:27 ` Ted Zlatanov
2013-12-20 0:41 ` Stephen J. Turnbull
2013-12-20 1:07 ` Ted Zlatanov [this message]
2013-12-20 11:15 ` Andreas Schwab
2013-12-20 11:32 ` Ted Zlatanov
2013-12-20 12:00 ` Stephen J. Turnbull
2013-12-20 13:12 ` Steinar Bang
2013-12-20 14:36 ` Ted Zlatanov
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=87lhzggwjb.fsf@flea.lifelogs.com \
--to=tzz@lifelogs.com \
--cc=emacs-devel@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).