git-revert

I am trying to understand what merge and rebase do, in terms of set operations in math. In the following, "-" means diff (similar to taking set difference in math, but "A-B" means those in A but not in B and minus those in B not in A), and "+" means patch (i.e. taking disjoint union in math. I haven't used patch before, so I am not sure). From Version Control with Git, by Loeliger, 2ed The command git cherry-pick commit applies the changes introduced by the named commit on the current branch. It will introduce a new, distinct commit. Strictly speaking, using git cherry-pick doesn’t alter the

How can I undo every change made to my directory after the last commit, including deleting added files, resetting modified files, and adding back deleted files? First reset the changes git reset HEAD --hard then clean out everything untracked. If you want to keep files that are not tracked due to .gitignore , be careful with this command. git clean -fd How can I undo every change made to my directory after the last commit, including deleting added files, resetting modified files, and adding back deleted files? You can undo changes to tracked files with: git reset HEAD --hard You can remove

Although I use Git pretty often, I'm still a beginner. Sometimes, I make a mistake but spot it only after I have committed it. At that point, I usually have to spend a long time on the Internet looking for the command I should use to get rid of it (before pushing). Every time that happens, I find myself wondering what's the difference between the four terms that I usually come across: revert, amend, rollback, undo. I've that it's finally time to learn those differences once and for all. What are they? jub0bs The terms revert and amend have a well defined meaning in Git. In contrast, rollback

For example, in the following master branch, I need to trash just the commit af5c7bf16e6f04321f966b4231371b21475bc4da, which is the second due to previous rebase: commit 60b413512e616997c8b929012cf9ca56bf5c9113 Author: Luca G. Soave <luca.soave@gmail.com> Date: Tue Apr 12 23:50:15 2011 +0200 add generic config/initializers/omniauth.example.rb commit af5c7bf16e6f04321f966b4231371b21475bc4da Author: Luca G. Soave <luca.soave@gmail.com> Date: Fri Apr 22 00:15:50 2011 +0200 show github user info if logged commit e6523efada4d75084e81971c4dc2aec621d45530 Author: Luca G. Soave <luca.soave@gmail.com>

OK, so I'm getting an error sometimes when I try to revert a commit (with Git). All that I do is git revert <commit hash> and it gives me this message: error: could not revert <commit hash> <commit message> hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' Does this mean that I should use git mergetool and resolve any conflicts? Once I do this can I add/rm and then commit, and the revert is complete? Yes you will have to resolve the conflicts, mark them as so with git add or git rm and git commit The commit is not done yet, after the

I made a change in a script and committed it. Then I made a few other changes, and pushed them to a remote repository and such. Then I realised that first change I mentioned was stupid, and want to undo it.. Can I "unapply" that commit, without manually copy/pasting the diff? As an example: I have two files, a.py and b.py : Commit 1: I delete a function in a.py Commit 2: I change a few lines in b.py Commit 3: I change the docstring in a.py Can I undo that function deletion, and make it appear as "commit 4" (rather than deleting commit 1) Yes, you can use git revert for this. See the git manual