As long as you’re just renaming a file, and not a folder, you can just use git mv: git mv -f yOuRfIlEnAmE yourfilename (As of a change in Git 2.0.1, the -f flag in the incantation above is superfluous, but it was needed in older Git versions.)
Detached head means you are no longer on a branch, you have checked out a single commit in the history (in this case the commit previous to HEAD, i.e. HEAD^). If you want to delete your changes associated with the detached HEAD You only need to checkout the branch you were on, e.g. git checkout … Read more
The following command deletes all your stashes: git stash clear From the git documentation: clear Remove all the stashed states. IMPORTANT WARNING: Those states will then be subject to pruning, and may be impossible to recover (…).
Note: please see an alternative to git rebase -i in the comments below— git reset –soft HEAD^ First, remove the commit on your local repository. You can do this using git rebase -i. For example, if it’s your last commit, you can do git rebase -i HEAD~2 and delete the second line within the editor … Read more
The Easy Way™ It turns out that this is such a common and useful practice that the overlords of Git made it really easy, but you have to have a newer version of Git (>= 1.7.11 May 2012). See the appendix for how to install the latest Git. Also, there’s a real-world example in the … Read more
You can use git checkout — file You can do it without the — (as suggested by nimrodm), but if the filename looks like a branch or tag (or other revision identifier), it may get confused, so using — is best. You can also check out a particular version of a file: git checkout v1.2.3 … Read more
From linux symlink manual (assuming you are in Linux): A symbolic link is a special type of file whose contents are a string that is the pathname of another file, the file to which the link refers. (The contents of a symbolic link can be read using readlink(2).) So a symbolic link is one more … Read more
The problem with the other two answers is that the new master doesn’t have the old master as an ancestor, so when you push it, everyone else will get messed up. This is what you want to do: git checkout better_branch git merge –strategy=ours master # keep the content of this branch, but record a … Read more
git diff can show you the difference between two commits: git diff mybranch master — myfile.cs Or, equivalently: git diff mybranch..master — myfile.cs Note you must specify the relative path to the file. So if the file were in the src directory, you’d say src/myfile.cs instead of myfile.cs. Using the latter syntax, if either side … Read more
Just calling git rm –cached on each of the files you want to remove from revision control should be fine. As long as your local ignore patterns are correct you won’t see these files included in the output of git status. Note that this solution removes the files from the repository, so all developers would … Read more