git

Git: merge all changes from another branch as a single commit

In Git, is there a way to merge all changes from one branch into another, but squash to a single commit at the same time? I often work on a new feature in a separate branch and will regularly commit/push - mainly for backup or to transfer what I'm working on to another machine. Mostly those commits say "Feature xxx WIP" or something ...

Pre-commit hook for Git when Hudson build has failed

I'm trying to figure out how to write a pre-commit hook for Git that checks the status of my Hudson build. If the previous build failed, it should disallow anyone from committing without first writing a specific line, e.g. "fixed build." EDIT: The first answerer has provided one side of the coin: the Hudson API. I now need the other s...

How do I download a specific git commit from a repository?

I don't have a local code copy/etc, I just want to download a single specific git commit so I can view it. I have the url for the git repository: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git and the commit hash: ee9c5cfad29c8a13199962614b9b16f1c4137ac9 How can I download just this commit using git (I don't want th...

Git merge the middle commit in a branch

This is my current repo. Z(master)---A---B---C---D(branch A) \ ---E---F(branch B) I want to merge commit A to master, can anyone advise how to do that? (desired) Z---A(master)---B---C---D(branch A) \ ---E---F(branch B) EDIT: The advance of base to branch B from A to B is my typo. Please disregard...

Git rebase got 'unlink of file failed' error

Using msysgit 1.7.0.2, when doing git rebase -i, it hangs and there's no message. After enter ctrl+c, I can see 'unlink of file failed, should I try again (y/n)?' Then I tried git rebase --abort but got same error message. So now it's stuck in the middle of rebase process. This error seems like caused by read-only file. Is there any way...

How to set up your username in Git if it contains special characters?

Hey there. I'm using Git for windows (The msysgit project). And working with the GIT Bash. I'm also pushing my programmed stuff to gitHub. The problem is that my gitHub's user name contains a "č" character and the GIT Bash won't let me type that in. Is there a way of setting my --global user.name within my GIT settings to contain that "č...

git checkout HEAD~2 (example) deletes untracked files if they were added with last commit. Unwanted!

I add new files (which were present before as untracked files) and commit them. When I checkout to before this commit, these files are deleted. They should not. It does not matter whether .gitignore lists these files or not (which requires to do git add -f ...). ...

Working with Symfony and Git (collaboration)

Hello everyone, Suppose we have a Project with three applications — A, B and C. Our team: Jack, Susan and Martin. And one project leader — David. Each programmer is working on their own application: A - Jack B - Susan C - Martin So, there is a problem with source code management. How to effectively organize it with G...

What is the "cloned repository's currently active branch"

I've been using Git reasonably successfully (perhaps that's an optimistic evaluation) for going on 2 years now, but have admittedly been doing so somewhat blindly. For whatever reason, I've begun to get much more curious about the internals and have been digging into remote tracking branches of late. They make sense on the whole, but I'm...

GIT: List all commits for a specific file

Hi there! Well, the subject says everything. Is there a way to list all commits that changed a specific file? I don't mind if that involves some bash magic, but it'd be way cooler if git already has this feature and I'm just so dumb not to be able to find it anywhere. If anyone can enlighten me on this, domo arigato. Regards, ...

Git remote/shared pre-commit hook

With a one official repository as the remote, and multiple local repositories cloned from it, can a pre-commit hook be scripted on that main repository and be enforced on all clones of it? ...

What's the best way to deploy multiple projects to a server with Git?

I am about to take the plunge and start using Git for actual projects that others use! So far I've used Git on some basic projects and played around with Github for some university projects, but now me and some others will be working on multiple projects. As a result we'll be hosting Git on a remote server and to be honest it'd be great...

Integrate Dreamweaver with Git on OS X

I'm in the process of adopting Git with my company, however some of the designers use Dreamweaver for composition and layout. Dreamweaver includes a tool for SVN, but I've been trying to find a way for them to include git so they can visually commit and push their changes to the repository. Googling, I've found GitWeaver but it seems t...

Why does git fetch via hudson fail, while git fetch via the command line works?

I'm trying to fetch a read-only git repository from github and have it be built via hudson. This process is failing. This is the hudson output: Started by an SCM change Checkout:workspace / d:\hudson\home\jobs\gdcm-hudson\workspace - hudson.remoting.LocalChannel@19ba1d8 Using strategy: Default Checkout:workspace / d:\hudson\home\jobs\...

Structuring a central Git remote to serve production Apache sites

I've been referring to http://toroid.org/ams/git-website-howto as a starting point for a production web server running on a managed VPS. The VPS runs cPanel and WHM, and it will eventually host multiple client websites, each with its own cPanel account (thus, each with its own Linux user and home directory from which sites are served). E...

OpenID with Gerrit not working

When I click to Register or Sign In using Gerrit Code Review, I get this error: Provider is not supported, or was incorrectly entered. And when I enter the URL into the OpenID field manually, it takes me to a Google page stating: The page you requested is invalid. Any clue what's happening here? EDIT: Upon further investigation, I rea...

git: stage only new files

Hello, When I have: dirty working directory, dirty staging area, and I copied some new files to the project, how do I stage only the new ones? git alias adduntracked=… ...

Git: how to reset a working file to its index version?

The problem is the following: how to fetch a few files from a previous commit in git? I could get the files one by one and replace them by their old version: git show <commit>:<path> >! path However, I would like to know whether there is a different way of performing the same thing, possibly with git reset. In fact, I gather that ...

rebasing branch, which has own branches

I can't make git push origin B. I have situation something like this _____________________________________ A \ \ _____origin/B \ / \___________/____________. B\ \______________ ...

How do I move a commit between branches in Git?

I'm sure this is a simple thing that has been asked and answered, but I don't know what terms to search for. I have this: /--master--X--Y A--B \--C--D--E Where I commited C, D, and E (locally only) on a branch, but then I realized that D and E are really independent of C. I want to move C to its own branch, and keep D and E fo...