From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] trunk r115470: eww: exit and close actions Date: Fri, 20 Dec 2013 14:12:09 +0100 Organization: Probably a good idea Message-ID: References: <87haadq3pn.fsf@flea.lifelogs.com> <878uvoq0md.fsf@flea.lifelogs.com> <8761qso84n.fsf@flea.lifelogs.com> <87d2kwmo1l.fsf@flea.lifelogs.com> <8738loiz5o.fsf@flea.lifelogs.com> <87mwjwxsjf.fsf@uwakimon.sk.tsukuba.ac.jp> <87lhzggwjb.fsf@flea.lifelogs.com> <8738lnbwox.fsf@igel.home> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1387545146 31631 80.91.229.3 (20 Dec 2013 13:12:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 20 Dec 2013 13:12:26 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 20 14:12:32 2013 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 1VtzsT-0001AK-ON for ged-emacs-devel@m.gmane.org; Fri, 20 Dec 2013 14:12:29 +0100 Original-Received: from localhost ([::1]:49456 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtzsT-0004AE-9x for ged-emacs-devel@m.gmane.org; Fri, 20 Dec 2013 08:12:29 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtzsK-000491-5Y for emacs-devel@gnu.org; Fri, 20 Dec 2013 08:12:26 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VtzsD-0002Sd-VS for emacs-devel@gnu.org; Fri, 20 Dec 2013 08:12:20 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:35810) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtzsD-0002Ry-OI for emacs-devel@gnu.org; Fri, 20 Dec 2013 08:12:13 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1VtzsC-0000vK-RF for emacs-devel@gnu.org; Fri, 20 Dec 2013 14:12:12 +0100 Original-Received: from 146.2.243.105 ([146.2.243.105]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 20 Dec 2013 14:12:12 +0100 Original-Received: from sb by 146.2.243.105 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 20 Dec 2013 14:12:12 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 37 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 146.2.243.105 Mail-Copies-To: never User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3 (windows-nt) Cancel-Lock: sha1:wkgC9aBuH6KOvuoWMXY2+9+xMu8= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:166659 Archived-At: >>>>> Andreas Schwab : [on "git reset"] > It does nothing like that, it *only* changes your worktree, like you can > do with our editor. This is wrong (unless you take your editor down into the .git directory and start messing with the local index manually... which is not recommended...!). What git reset does is reset the current branch to , where typically(*) is a commit earlier than HEAD of the current branch. The files in the work tree are left untouched (ie. local edits are not removed). The command git reset --hard resets the current branch in the same manner, and make the files in the work tree have the version in . Until you try pushing the changes to a remote, the changes only have local effect. If you try pushing a branch that has been reset to an earlier commit, git will refuse to do so. If the remote repository permits it, the branch can be pushed. The forcibly pushed branch will create issues for other users that have fetched that branch between the original push and the reset push. How bad the issues are depends on what has happened to the branch in the different users' local git repositories... but there _will_ be issues. (*) However can be any commit on any branch, or any tag or branch name which can have disastrous effects, like eg. overwriting your changes in a local-only branch with the contents of a different branch