From: Mihamina Rakotomandimby <mihamina@gulfsat.mg>
To: Git Mailing List <git@vger.kernel.org>
Subject: reverting vs resetting
Date: Fri, 5 Feb 2010 09:12:23 +0300 [thread overview]
Message-ID: <20100205091223.6b4cffb1@pbmiha.malagasy.com> (raw)
Manao ahoana, Hello, Bonjour,
We put a gateway iptables script (SNAT, DNAT,...) under GIT.
Someone (Bob) made a mistake on it, but he did not know. That broke the
gateway.
Another one (Andy), did not try to undo Bob's mistake but tried (and
tried, and tried... always committing) to solve the problem. Andy made
about 50 commits.
When we decided to giveup, we decided to get back to the configuration
before Bob broke it. But it would be interesting to see Andy's history.
Reverting or resetting?
As far as I know:
- Reverting Bob's commit will only cancel Bob's mistake but not Andy's
tries to solve it.
- Resetting will forget the history.
Any suggestion?
Misaotra, Thanks, Merci.
--
Architecte Informatique chez Blueline/Gulfsat:
Administration Systeme, Recherche & Developpement
+261 34 29 155 34 / +261 33 11 207 36
next reply other threads:[~2010-02-05 10:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-05 6:12 Mihamina Rakotomandimby [this message]
2010-02-05 6:48 ` reverting vs resetting Avery Pennarun
2010-02-05 7:09 ` Junio C Hamano
2010-02-05 8:41 ` Matthieu Moy
2010-02-05 11:21 ` Mihamina Rakotomandimby
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=20100205091223.6b4cffb1@pbmiha.malagasy.com \
--to=mihamina@gulfsat.mg \
--cc=git@vger.kernel.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.
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).