This question is similar to this one, but more specific. I have a project with two branches: staging and beta. I develop on staging, and use the master branch to fix bugs. So if I’m working on staging and I see an error, I change to master branch: git checkout master and do the stuff: … Read more
We have a Git repository with over 400 commits, the first couple dozen of which were a lot of trial-and-error. We want to clean up these commits by squashing many down into a single commit. Naturally, git-rebase seems the way to go. My problem is that it ends up with merge conflicts, and these conflicts … Read more
I sometimes use the checkout -b option to create a new branch, check it out at the same time and set up tracking in one command. In a new environment, I get this error: $ git checkout -b test –track origin/master fatal: Cannot update paths and switch to branch ‘test’ at the same time. Did … Read more
I did a git stash pop and ended up with merge conflicts. I removed the files from the file system and did a git checkout as shown below, but it thinks the files are still unmerged. I then tried replacing the files and doing a git checkout again and same result. I event tried forcing … Read more
I have made some changes to a file which has been committed a few times as part of a group of files, but now want to reset/revert the changes on it back to a previous version. I have done a git log along with a git diff to find the revision I need, but just … Read more
So I’ve done some work in the repository and when I’m about to commit I realize that I’m not currently on any branch. This happens a lot when working with submodules and I am able to solve it, but the process is tedious and I’ve been thinking that there must be an easier way to … Read more
I used git checkout -b to create a new branch. I think that git branch does the same thing. How do these two commands differ, if they differ at all? 7 Answers 7
I have an old commit that I did a few weeks ago. I want to restore only a single file from that commit. What do I do? 4 Answers 4
In the remote server I have a post-receive hook set up in order to make a git checkout of my repository: #!/bin/sh GIT_WORK_TREE=/var/www/<website> git checkout -f But when I make a push from my local machine to the git repository in the server, I get the following error messages: remote: error: unable to unlink old … Read more
What is the most efficient mechanism (in respect to data transferred and disk space used) to get the contents of a single file from a remote git repository? So far I’ve managed to come up with: git clone –no-checkout –depth 1 [email protected]:foo/bar.git && cd bar && git show HEAD:path/to/file.txt This still seems overkill. What about … Read more
