git-reset

I have a repo with four commits: $ git log --oneline --decorate 6c35831 (HEAD, master) C4 974073b C3 e27b22c C2 9f2d694 C1 I reset -- soft to the C2 commit and now I have a repo like so: $ git reset e27b22c --soft $ git log --oneline --decorate e27b22c (HEAD, master) C2 9f2d694 C1 Now I add an extra commit, so the log looks like this: $ git log --oneline --decorate 545fa99 (HEAD, master) C5 e27b22c C2 9f2d694 C1 What happened to commits C3 and C4 ? I haven't deleted them, so I assume they are still there, C3 's parent is still C2 . Short answer: Commits C3 and C4 will remain in the Git object

Need help figuring out a couple common workflows with Github. I come from a VS TFS background, so forgive me. Undoing Pending Changes Let's say I have cloned of a git repository to my local file system. At this point, the project's local files match exactly what's in the remote repoistory. Then I decided to make some changes to the code, and change the local versions of a couple files. After doing some testing, I figure out that I want to discard my local changes and revert the local files back to what they are in the remote repoistory. How do I undo these local changes, restoring them to the

I recently did a hard reset of my local git repository: In other words I reset it to an earlier point in time. Now when I try to push up to the origin it tells me that it can't because the origin contains work of a later date than my repository. This makes sense, but I don't care about the work the origin has after my local repository. If I first pull , which is what I am told to do, I presume that my local HEAD will then become whatever the origin HEAD was, i.e. with the additional work and my hard reset will be for nought. How should I proceed here? To recap, I don't care about the

This question already has an answer here: What are typical use cases of git-reset's --merge and --keep flags? 1 answer I have read the documentation , however I am having a hard time understanding the difference between git reset --merge And git reset --keep Please provide a simple explaination and/or example. I agree that the documentation is not very clear. From testing, I have found three differences, relating to what happens to files which: have staged changes no unstaged changes In summary: reset --merge always discards the index (staged changes); aborts if unstaged and staged changes

This is not a general question about what '--' does, as in the marked duplicate. This is a git-specific question asking for clarity on what the operational differences are between the mentioned commands. If I want to clean out my current directory without stashing or committing, I usually use these commands: git reset HEAD --hard git clean -fd A co-worker also mentioned using this command: git checkout -- . It's a difficult command to google, and it's not clear to me from the git documentation what this command actually does. It seems to be one of the later-mentioned usages in the manual. At a

I'm trying to learn Git. I'm confused between git rm --cached file and git reset file both of the commands seem to take the file from staged to un-staged area. How do the commands differ? git rm --cached <file> will completely remove the file's contents from the index. This means that on commit the file will be removed from the HEAD commit. (If the file was only added to the index and not yet tracked this is a "no-op".) git reset -- <file> resets the contents of the file in the index to be the same as the head commit. This means that on commit no changes will be committed to the file. This