Well, according to the documentation you link to, its sole purpose is to split and clarify the two different uses of git checkout: git switch can now be used to change branches, as git checkout <branchname> does git restore can be used to reset files to certain revisions, as git checkout — <path_to_file> does People … Read more
As you noted, HEAD is a label noting where you are in the commit tree. It moves with you when you move from one commit to another. git checkout <commit> is the basic mechanism for moving around in the commit tree, moving your focus (HEAD) to the specified commit. The commit can be specified by … Read more
‘origin/master‘ which can not be resolved as commit Strange: you need to check your remotes: git remote -v And make sure origin is fetched: git fetch origin Then: git branch -avv (to see if you do have fetched an origin/master branch) Finally, use git switch instead of the confusing git checkout, with Git 2.23+ (August … Read more
git checkout ‘master@{7 days ago}’ — path/to/file.txt This will not alter HEAD, it will just overwrite the local file path/to/file.txt See man git-rev-parse for possible revision specifications there (of course a simple hash (like dd9bacb) will do nicely) Don’t forget to commit the change (after a review…)
The Short Answer As long as you’re doing a fast-forward merge, then you can simply use git fetch <remote> <sourceBranch>:<destinationBranch> Examples: # Merge local branch foo into local branch master, # without having to checkout master first. # Here `.` means to use the local repository as the “remote”: git fetch . foo:master # Merge … Read more
Assuming you’re wanting to undo the effects of git rm <file> or rm <file> followed by git add -A or something similar: # this restores the file status in the index git reset — <file> # then check out a copy from the index git checkout — <file> To undo git add <file>, the first … Read more
When you have to unlink file, you have to have permission ‘w’ for directory, in which file is, not for the file…
You need a clean state to change branches. The branch checkout will only be allowed if it does not affect the ‘dirty files’ (as Charles Bailey remarks in the comments). Otherwise, you should either: stash your current change or reset –hard HEAD (if you do not mind losing those minor changes) or checkout -f (When … Read more
Another thing you can look at is through your IDE. I accidentally checkout 2 files and was able to bring back the changes through the ‘local history’ of my IDE (Netbeans). What a blessing! If you’re using Eclipse, do this by right clicking on the file and going to Team->Show Local History.
From the release notes for 1.6.2 @{-1} is a way to refer to the last branch you were on. This is accepted not only where an object name is expected, but anywhere a branch name is expected and acts as if you typed the branch name. E.g. git branch –track mybranch @{-1}, git merge @{-1}, … Read more