[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Emacs-diffs] trunk r115470: eww: exit and close actions

From: Steinar Bang
Subject: Re: [Emacs-diffs] trunk r115470: eww: exit and close actions
Date: Fri, 20 Dec 2013 14:12:09 +0100
User-agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3 (windows-nt)

>>>>> Andreas Schwab <address@hidden>:

[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

 git reset <commit>
does is reset the current branch to <commit>, where <commit> 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

The command
 git reset --hard <commit>
resets the current branch in the same manner, and make the files in the
work tree have the version in <commit>.

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 <commit> 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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]