Good or bad news for you, that hash IS the revision number. I also had trouble with this when I made the switch from SVN to git. You can use “tagging” in git to tag a certain revision as the “release” for a specific version, making it easy to refer to that revision. Check out … Read more
A single branch of another repository can be easily placed under a subdirectory retaining its history. For example: This will appear as a single commit where all files of Rails master branch are added into “rails” directory. However the commit’s title contains a reference to the old history tree: Add ‘rails/’ from commit <rev> Where <rev> is a … Read more
This could mean that another program is using the file, which is preventing git from “moving” the file into or out of the working directory when you are attempting to change branches. I have had this happen on Windows Vista where eclipse is the program “using” the file. The file may not be actually open … Read more
Apparently the files were added in remote repository, no matter what was the content of .gitignore file in the origin. As the files exist in the remote repository, git has to pull them to your local work tree as well and therefore complains that the files already exist. .gitignore is used only for scanning for the newly added … Read more
First, let’s clarify what HEAD is and what it means when it is detached. HEAD is the symbolic name for the currently checked out commit. When HEAD is not detached (the “normal”1 situation: you have a branch checked out), HEAD actually points to a branch’s “ref” and the branch points to the commit. HEAD is … Read more
This can be done by cloning to a new directory, then moving the .git directory into your existing directory. If your existing directory is named “code”. This can also be done without doing a checkout during the clone command; more information can be found here.
As noted previously, pass in the –no-commit flag, but to avoid a fast-forward commit, also pass in –no-ff, like so: To examine the staged changes: And you can undo the merge, even if it is a fast-forward merge:
I think you don’t have your permissions set up correctly for /var/www Change the ownership of the folder. sudo chown -R **yourusername** /var/www
You could use the same mechanism as git submodule init uses itself, namely, look at .gitmodules. This files enumerates each submodule path and the URL it refers to. For example, from root of repository, cat .gitmodules will print contents to the screen (assuming you have cat). Because .gitmodule files have the Git configuration format, you … Read more
Using git version 1.7.9.5 there is no “remove” command for remote. Use “rm” instead. or, as noted in the previous answer, set-url works. I don’t know when the command changed, but Ubuntu 12.04 shipped with 1.7.9.5. edit: a few people seem to have run into a situation where they do not have an “upstream” remote. … Read more