git-reset | 易学教程

git reset vs git reset HEAD

阅读更多关于 git reset vs git reset HEAD

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? VonC 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-rc1 , but since the default is not always known, the help message makes it clear to which commit you

Why are there two ways to unstage a file in Git?

阅读更多关于 Why are there two ways to unstage a file in Git?

Sometimes git suggests git rm --cached to unstage a file, sometimes git reset HEAD file . When should I use which? EDIT: D:\code\gt2>git init Initialized empty Git repository in D:/code/gt2/.git/ D:\code\gt2>touch a D:\code\gt2>git status # On branch master # # Initial commit # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # a nothing added to commit but untracked files present (use "git add" to track) D:\code\gt2>git add a D:\code\gt2>git status # On branch master # # Initial commit # # Changes to be committed: # (use "git rm --cached <file>..." to

“git rm --cached x” vs “git reset head -- x”?

阅读更多关于 “git rm --cached x” vs “git reset head -- x”?

问题 GitRef.org - Basic: git rm will remove entries from the staging area. This is a bit different from git reset HEAD which "unstages" files. By "unstage" I mean it reverts the staging area to what was there before we started modifying things. git rm on the other hand just kicks the file off the stage entirely, so that it's not included in the next commit snapshot, thereby effectively deleting it. By default, a git rm file will remove the file from the staging area entirely and also off your disk

Reset all changes after last commit in git

阅读更多关于 Reset all changes after last commit in git

问题 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? 回答1: 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 回答2: How can I undo every change made to my directory after the last commit, including deleting added files, resetting modified files,

Is there a difference between “git reset --hard hash” and “git checkout hash”?

阅读更多关于 Is there a difference between “git reset --hard hash” and “git checkout hash”?

问题 While reset and checkout have different usages most of the time, I can't see what difference there is between these two. There probably is one or nobody would have bothered adding a --hard option to do something the basic checkout can do. Maybe there is a difference is the way you will see the history? 回答1: This answer is mostly quoted from my answer to a previous question: git reset in plain english. The two are very different. They result in the same state for your index and work tree, but

How to discard local commits in Git?

阅读更多关于 How to discard local commits in Git?

问题 I'd been working on something, and decided it was completely screwed...after having committed some of it. So I tried the following sequence: git reset --hard git rebase origin git fetch git pull git checkout At which point I got the message Your branch is ahead of 'origin/master' by 2 commits. I want to discard my local commits , without having to wipe out my local directory and redownload everything. How can I accomplish that? 回答1: git reset --hard origin/master will remove all commits not

Git, How to reset origin/master to a commit?

阅读更多关于 Git, How to reset origin/master to a commit?

问题 I reset my local master to a commit by this command: git reset --hard e3f1e37 when I enter $ git status command, terminal says: # On branch master # Your branch is behind 'origin/master' by 7 commits, and can be fast-forwarded. # (use "git pull" to update your local branch) # nothing to commit, working directory clean Since I want to reset origin/header as well, I checkout to origin/master: $ git checkout origin/master Note: checking out 'origin/master'. You are in 'detached HEAD' state. You

Is it still possible to restore deleted untracked files in git?

阅读更多关于 Is it still possible to restore deleted untracked files in git?

问题 let's say yesterday I did some changes on my master branch, and I forgot to add, commit them. and in the morning i did git reset --hard is it possible to restore deleted files in this situation ? 回答1: Some better IDEs keep track of your files as a local history. If you removed files externally (say, git reset ) you should be able to click in your IDE on parent directory and choose "Compare with local history". I used this feature successfully in PHPStorm IDE when my untracked files got wiped

Can I delete a git commit but keep the changes

阅读更多关于 Can I delete a git commit but keep the changes

问题 In one of my development branches, I made some changes to my codebase. Before I was able to complete the features I was working on, I had to switch my current branch to master to demo some features. But just using a "git checkout master" preserved the changes I also made in my development branch, thus breaking some of the functionality in master. So what I did was commit the changes on my development branch with a commit message "temporary commit" and then checkout master for the demo. Now

Recover files that were added to the index but then removed by a git reset

阅读更多关于 Recover files that were added to the index but then removed by a git reset

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^ — bad idea obviously, all files were deleted so then I used git reflog to find where I left off then I