From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?UTF-8?B?Sm/Do28gVMOhdm9yYQ==?= Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message, Date: Tue, 14 Apr 2015 22:23:01 +0100 Message-ID: References: <83d23hlmia.fsf@gnu.org> <20150407165131.GA2600@acm.fritz.box> <552486A4.2020803@yandex.ru> <5525D65C.8090303@yandex.ru> <83fv89g3dl.fsf@gnu.org> <87mw2he0d7.fsf@uwakimon.sk.tsukuba.ac.jp> <20150413210654.GB6324@acm.fritz.box> <878udv8w4j.fsf@uwakimon.sk.tsukuba.ac.jp> <20150414171635.GB4612@acm.fritz.box> <837fteboro.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1429046634 10072 80.91.229.3 (14 Apr 2015 21:23:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 14 Apr 2015 21:23:54 +0000 (UTC) Cc: Alan Mackenzie , Stephen Turnbull , emacs-devel , Richard Stallman , Brief Busters To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 14 23:23:53 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Yi8J1-0004l2-AF for ged-emacs-devel@m.gmane.org; Tue, 14 Apr 2015 23:23:39 +0200 Original-Received: from localhost ([::1]:57959 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yi8J0-0003ur-9S for ged-emacs-devel@m.gmane.org; Tue, 14 Apr 2015 17:23:38 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60330) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yi8Io-0003ul-Eh for emacs-devel@gnu.org; Tue, 14 Apr 2015 17:23:27 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yi8In-0007fZ-Iz for emacs-devel@gnu.org; Tue, 14 Apr 2015 17:23:26 -0400 Original-Received: from mail-ig0-x232.google.com ([2607:f8b0:4001:c05::232]:37398) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yi8Ik-0007f2-UP; Tue, 14 Apr 2015 17:23:23 -0400 Original-Received: by igblo3 with SMTP id lo3so26087231igb.0; Tue, 14 Apr 2015 14:23:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; bh=jcEE90BKXLdSBiot4fuXnPVT5n8OuakvtA9Wv7DqYbU=; b=O3AS3mI2jlcgz5C0++kQLPp4lBha5XXLLAXgUizOoQNcVUK2mv0thoUnDeKSObMmv0 87Q6dagvkMrwR1LrNttnzitBiF2Zh0yhfJXs/WsjrwExYsl340iYQO7jVobsc3+mxEA0 /opYohO8nmAnULLt8dKNEFM+9oU7q6UMjLlZPXUA5+nVyE6FcoqM4Az9VGWpxPY5p4Ti 4XkViuNo95HPvGWZYPABKurR7mR/ZYK69NE1L+17jsG5sdgS+mzg/DOyLS1Uk3PHa51y GfEj3Sl7FjWfe7IvNzDubphx3toGP1OGciEGw57gavTW2h/RyQRFaid24OMZ4/u1Jxu9 7GjQ== X-Received: by 10.50.61.175 with SMTP id q15mr27417570igr.34.1429046602496; Tue, 14 Apr 2015 14:23:22 -0700 (PDT) Original-Received: by 10.107.17.219 with HTTP; Tue, 14 Apr 2015 14:23:01 -0700 (PDT) In-Reply-To: <837fteboro.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c05::232 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:185430 Archived-At: On Tue, Apr 14, 2015 at 6:31 PM, Eli Zaretskii wrote: > The only way I found to be efficient is Google. In this case, try > something like "git how to revert changes in a file". You normally > get good hits right away. I second google (or duckduckgo, for that matter) But actually, to revert changes in a particular file, `git status` , a command you should run often to see where you are, gives you a pretty good hint: [emacs] echo bla >> README [emacs] git status # On branch master # Changes not staged for commit: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # # modified: README # no changes added to commit (use "git add" and/or "git commit -a") More hints would be there if I had staged something, telling me how to move between staged and unstaged states of a file. The only hint I (personally) dislike is the "git pull" one that appears on a failed "git push". Perhaps these hints aren't showing by default with some git installations and that's causing confusion? --=20 Jo=C3=A3o T=C3=A1vora