From: Steinar Bang <sb@dod.no>
To: emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] trunk r115470: eww: exit and close actions
Date: Fri, 20 Dec 2013 14:12:09 +0100 [thread overview]
Message-ID: <upzclhzfmzti.fsf@dod.no> (raw)
In-Reply-To: 8738lnbwox.fsf@igel.home
>>>>> Andreas Schwab <schwab@linux-m68k.org>:
[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 <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
removed).
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
branch
next prev parent reply other threads:[~2013-12-20 13:12 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
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 [this message]
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=upzclhzfmzti.fsf@dod.no \
--to=sb@dod.no \
--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).