From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Mike Hommey <mh@glandium.org>
Cc: Robin Rosenberg <robin.rosenberg.lists@dewire.com>,
Junio C Hamano <gitster@pobox.com>,
Steven Grimm <koreth@midwinter.com>,
Pierre Habouzit <madcoder@debian.org>,
git@vger.kernel.org
Subject: Re: [PATCH] git-revert is one of the most misunderstood command in git, help users out.
Date: Wed, 7 Nov 2007 11:08:04 +0000 (GMT) [thread overview]
Message-ID: <Pine.LNX.4.64.0711071103450.4362@racer.site> (raw)
In-Reply-To: <20071107081608.GA19066@glandium.org>
Hi,
On Wed, 7 Nov 2007, Mike Hommey wrote:
> On Tue, Nov 06, 2007 at 10:25:48PM +0000, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
>
> > On Tue, 6 Nov 2007, Robin Rosenberg wrote:
> >
> > > tisdag 06 november 2007 skrev Mike Hommey:
> > > > Maybe the documentation could emphasise on how to undo things when
> > > > the user makes mistakes. Sometimes, saving your repo can be as
> > > > simple as git reset --hard HEAD@{1}. This is not, unfortunately, a
> > > > works-for-all-cases command.
> > >
> > > Yea, git-undo(7).
> >
> > In related news, I know a few users who need an un-rm-rf. Anyone?
>
> The fact is you can do harm to your repo with things you wouldn't expect
> to break things, except maybe you gave bad arguments or so. It's quite
> easy to fuck up with git-rebase, or to merge the wrong commits, etc.
I don't see how these commands are dangerous. Usually you just look into
the reflog, pick the one commit you started with, and reset --hard.
The _only_ commands I find dangerous are "git stash clear" and "git reflog
--expire=0". Funnily, people want to do that all the time.
Like recently, on the IRC channel, where somebody lost patches "during a
rebase", by "rm -rf .dotest".
There will be a point where nobody can help. But before that, reflogs are
your friend. But you must not do "reset --hard HEAD@{1}" blindly. You
have to look first what the reflogs are.
Ciao,
Dscho
next prev parent reply other threads:[~2007-11-07 11:08 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-05 19:01 [PATCH] git-revert is one of the most misunderstood command in git, help users out Pierre Habouzit
2007-11-05 19:04 ` Pierre Habouzit
2007-11-05 19:05 ` J. Bruce Fields
2007-11-05 19:10 ` Pierre Habouzit
2007-11-05 19:28 ` Steven Grimm
2007-11-05 19:50 ` Pierre Habouzit
2007-11-05 21:54 ` Alejandro Martinez Ruiz
2007-11-05 22:06 ` David Kastrup
2007-11-05 23:41 ` Alejandro Martinez Ruiz
2007-11-05 22:21 ` Junio C Hamano
2007-11-05 23:40 ` Johannes Schindelin
2007-11-06 0:08 ` Pierre Habouzit
2007-11-06 2:51 ` Junio C Hamano
2007-11-06 3:18 ` Johannes Schindelin
2007-11-06 4:54 ` Junio C Hamano
2007-11-06 8:49 ` Pierre Habouzit
2007-11-06 9:29 ` Mike Hommey
2007-11-06 9:37 ` Pierre Habouzit
2007-11-06 12:32 ` Johannes Schindelin
2007-11-06 18:06 ` Junio C Hamano
2007-11-06 18:27 ` Johannes Schindelin
2007-11-06 19:39 ` Pierre Habouzit
2007-11-06 19:42 ` Junio C Hamano
2007-11-06 22:21 ` Johannes Schindelin
2007-11-06 20:06 ` Robin Rosenberg
2007-11-06 20:13 ` Mike Hommey
2007-11-06 21:21 ` Robin Rosenberg
2007-11-06 22:25 ` Johannes Schindelin
2007-11-07 8:16 ` Mike Hommey
2007-11-07 11:08 ` Johannes Schindelin [this message]
2007-11-07 19:32 ` Robin Rosenberg
2007-11-07 20:01 ` Jakub Narebski
2007-11-07 9:03 ` David Kastrup
2007-11-06 11:08 ` Junio C Hamano
2007-11-06 11:51 ` Johannes Sixt
2007-11-06 12:16 ` Johannes Schindelin
2007-11-06 12:25 ` Johannes Schindelin
2007-11-06 12:48 ` Pierre Habouzit
2007-11-06 17:43 ` Wincent Colaiuta
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0711071103450.4362@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=koreth@midwinter.com \
--cc=madcoder@debian.org \
--cc=mh@glandium.org \
--cc=robin.rosenberg.lists@dewire.com \
/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.
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 NNTP newsgroup(s).