Well the solution was pretty simple, hinted by Pat Notz and Bombe. #Make sure we’re on the master branch $ git checkout master # Make a new branch to hold the work I’ve done $ git branch old_master # Save this branch on my remote repo (for backup) $ git checkout old_master $ git push … Read more
As of 1.7.7.3, git config –global pager.stash false accomplishes this.
The same way you’d use rm to remove such a file: quote the name: git rm “TestService/TestService copy-Info.plist” or git rm ‘TestService/TestService copy-Info.plist’ or git rm TestService/TestService\ copy-Info.plist Depending on your shell and the names of other files, tab completion may help with this. Typing $ git rm TeTab will likely complete the directory name: … Read more
You can also run the following to reset to the remote’s HEAD: git reset –hard <REMOTE>/<BRANCH_NAME> Ex: git reset –hard origin/master
Yes, Select the items (select top one hit shift, select bottom one) and hit CTRL T Or go to commit -> stage to commit
Just pick the hash you want to go back to and in your clone do: git reset –hard hash# git push -f origin branch where branch is the name of the branch you want to push. Voilà. Be carefully with the force push. You may want to copy your working directory until you are familiar … Read more
This worked for me: git.exe clone “d:/dev/SDK” “//comp1/Proj/git/SDK/”
Make sure your .class files were not already added to the index. You would need to git rm -r –cached path/to/.classfiles/ those files first. (they will still be on the disk, but no longer part of the git index, and will be ignored by the git status) If you don’t want any .class file versioned … Read more
Main menu “Team->Show Annotations” OR “Git->Show Annotations” in the context menu of a file in the project/files view OR define a shortcut for the action “Show Annotations” (Category Git) in the keymap options
Just use git stash pop or git stash apply. As long as the stashed changes do not conflict with what you pulled or edited, it will just work, if not you get some merge conflicts that you can resolve like when you do a merge or rebase.