git-reset

问题 Every time a file has been staged, Git offers helpful instructions in the event you needed to unstage a file: (use "git reset HEAD <file>..." to unstage) However the decent Git Tutorials by Atlassian simply say: git reset <file> This seems more straightforward, so why the difference? 回答1: No difference (from git reset man page) in term of default parameter: The <tree-ish>/<commit> defaults to HEAD in all forms. That message initially did not include HEAD: commit 3c1eb9c, Jan. 2007, git 1.5.0

问题 I added some files to the index but then by mistake I deleted them with git reset --hard . How do I recover them? Here's what happened: I added all files using git add . I then committed When I checked the status, there were still files that weren't included in the commit from the add, which was strange I added the untracked files again and it worked this time But I wanted everything to be in 1 single commit so I looked up how to unstage what I just committed I used git reset --hard HEAD^ —

问题 I had done five commits and I wanted to make them all into one commit before pushing them. For some reason I decided to try doing this by a different means than I usually use. FWIW: I was attempting to follow the instructions here http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html . I'll put a lot of detail below but you might want to skip down to the bottom of the question where I put the output of git reflog because I suspect that's what's significant here. So here's

问题 I made a commit, pulled and merged some changes, and then made a second commit. When I wanted to go back to the first commit, I ran the command git reset --hard <sha hash> While the response was "HEAD is now at <sha hash>", my code looks just as it did before I ran that command. Usually, it changes to what I had before, but it looks like something isn't working correctly. Do I need to run a different command to unmerge before resetting head? Extra info When I run git status it says: app

问题 I've seen commands like: git reset e542 -- readme.txt I understand this command puts in the index the contents of the file readme.txt from commit e542. But what's the -- option doing there? The git reset man page lists it as optional for the first two forms but I couldn't find what it means. git reset [-q] [<commit>] [--] <paths>… git reset (--patch | -p) [<commit>] [--] [<paths>…] 回答1: -- separates branch names from file names, in case there is any ambiguity (if you have a branch and a file

问题 I committed some unnecessary code so I used: git reset HEAD~ I checked out the files and tried to push my last commits (which were correct). However, I'm receiving error: error: failed to push some refs to 'git@github.com:MyProject/MyProject.git' hint: Updates were rejected because the tip of your current branch is behind which is probably since the commit is not reverted correctly since when I do git pull, the commit is back again. How can I correctly revert this commit? additional info: git

问题 I had some changes in the stash that I attempted to recover using git stash pop . There were some merge conflicts, and rather than resolving them, I decided to just reset it. Unfortunately, in a moment of stupidity, I did a git reset --hard , and now all of the previously stashed changes are gone. Is there any way to recover these changes? I've tried git fsck --cache --no-reflogs --lost-found --unreachable HEAD , but none of the commit hashes listed refer to the changes I need. What else can

问题 The documentation states that leveraging the --soft option "...Does not touch the index file nor the working tree at all, but requires them to be in a good order. This leaves all your changed files "Changes to be committed", as git status would put it" . It also explains that the target <commit> defaults to HEAD, when not given. Considering these, does the following command modify anything at all? $ git reset --soft 回答1: Considering these, does the following command modify anything at all? No

问题 I have a modified file which I want to rever to whatever is in the latest commit but it's "stuck" there always being marked as modified. $ git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: index.php # no changes added to commit (use "git add" and/or "git commit -a") I then try: $git checkout -- index.php But the output of git status is

问题 I have added a directory with git add and realized that there are wrong files in it, so I used git reset --hard to go back to the latest commit but I didn't know that git would also delete those added files in the working copy. Does anyone know how I undo this? 回答1: When you git add a file, it is added to the object database and to the index. Running git reset updated the index and the working directory, but it did not remove those files from the object database. They remain as unrooted (