git/list[1] front-page[2] threads[3] people[4] search[5] about
 

reverting vs resetting

From
MRMihamina Rakotomandimby <mihamina@gulfsat.mg>
Date
Feb 5, 2010, 06:12 UTC
Message-ID
<20100205091223.6b4cffb1@pbmiha.malagasy.com>
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: Avery Pennarun
Message 1 of 5 in “reverting vs resetting”
  1. Mihamina RakotomandimbyFeb 5, 2010
  2. Avery PennarunFeb 5, 2010
  3. Junio C HamanoFeb 5, 2010
  4. Matthieu MoyFeb 5, 2010
  5. Mihamina RakotomandimbyFeb 5, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.