Arquivo da tag: Delete

Delete commits from a branch in Git

Careful: git reset –hard WILL DELETE YOUR WORKING DIRECTORY CHANGES. Be sure to stash any local changes you want to keep before running this command.

Assuming you are sitting on that commit, then this command will wack it…

git reset --hard HEAD~1

The HEAD~1 means the commit before head.

Or, you could look at the output of git log, find the commit id of the commit you want to back up to, and then do this:

git reset --hard <sha1-commit-id>

If you already pushed it, you will need to do a force push to get rid of it…

git push origin HEAD --force

However, if others may have pulled it, then you would be better off starting a new branch. Because when they pull, it will just merge it into their work, and you will get it pushed back up again.

If you already pushed, it may be better to use git revert, to create a “mirror image” commit that will undo the changes. However, both commits will be in the log.

FYI — git reset –hard HEAD is great if you want to get rid of WORK IN PROGRESS. It will reset you back to the most recent commit, and erase all the changes in your working tree and index.

Lastly, if you need to find a commit that you “deleted”, it is typically present in git reflog unless you have garbage collected your repository.

Undo/Delete scaffolding in Rails

First, if you have already run the migrations generated by the scaffold command, you have to perform a rollback first.

<code><span class="pln">rake db</span><span class="pun">:</span><span class="pln">rollback</span></code>

You can create scaffolding using:

<code><span class="pln">rails generate scaffold </span><span class="typ">MyFoo</span> </code>

(or similar), and you can destroy/undo it using

<code><span class="pln">rails destroy scaffold </span><span class="typ">MyFoo</span></code>

That will delete all the files created by generate, but not any additional changes you may have made manually.