git

How can I get my git (msysgit on windows) post-commit script to invoke my python script as python rather than bash?

I wrote a post commit script in python, "c:\myfolder\myscript.py". I want to invoke it from the post-commit script. This doesn't find it: #!/bin/sh c:\myfolder\myscript.py bash thinks the command c:myfoldermyscript.py - the slashes get dropped. So, I tried forward slashes: #!/bin/sh c:/myfolder/myscript.py But then it seem...

Git : Start a new project with some commits from an other one

I have this "--bare" project on my server named "WebsiteCore" and every git commit is a feature. I wish to create a new project with some commits from "WebsiteCore" (I just want some features). I would also like to make an other "--bare" project on my server to work on the new project remotely. I'm not really experienced with git and...

Pushing to bare Git repository (remote) causes it to stop being bare

I have a local repository called TestRepo. I clone it with the --bare option, zip this clone up, and throw it on my server. Unzip it, and it's still bare. I then clone the bare remote repository locally over ssh with something like git clone ssh://[email protected]/~/TestRepo.git TestRepoCloned The local TestRepoCloned is not bare and ha...

Git: Find common ancestor of two branches.

I would like to find the last common ancestor commit of two different branches. Is there an easy way to do this in git 1.6 ? ...

Git and pbxproj

I was looking at an open source Mac application, and they gave some suggested values for .gitignore. They were what I would expect... However, they also suggested an entry into a .gitattributes file: *.pbxproj -crlf -diff -merge I'm not the most knowledgable in terms of git, so I was wondering - what exactly are the benefits of adding...

Is it possible to push a git stash to a remote repository?

In git, is it possible to create a stash, push the stash to a remote repository, retrieve the stash on another computer, and apply the stash? Or are my options: Create a patch and copy the patch to the other computer, or Create a minor branch and commit the incomplete work to that branch? ...

Git Submodules. How do I make them entirely self-contained?

I'm a happy user of Github. Over time I have accrued a number of little unrelated toy repos. I would now like to create a container repo - call it playpen, pull my various toy projects underneath the parent playpen as git submodules, and blow away to source toy repos. The toys should only live in the playpen. When I tried this using this...

Git Subtree. Why can't I branch from a subtree rather than the root?

I am struggling trying to make sense of using the Git subtree strategy. My intent was to pull some disparate repos together into a little family of toy repos under an umbrella repo. I'm using the subtree strategy detailed here: http://help.github.com/subtree-merge I am pulling my hair out trying to convince Git that I want to create a b...

How can I shell out of an ASP.NET page and execute a git command?

I want my ASP.NET page to shell out and execute git commands. I put the commands in a bat file which works: REM cd to the git repo folder cd c:\temp\mygitrepo "c:\Program Files\Git\Bin\git.exe" show c090dc4b8b1b3512c1b5363c371e21d810d02f54 -- myfile.txt If I run my .bat file from a cmd prompt, no problem. If I run it using System.Di...

git: show all changed files between two commits

I have a bunch of commits in the repo. I want to see a list of files changed between two commits - from SHA1 to SHA2, what command should I use? ...

splitting a git repository

I currently have a git repository that I imported from svn a while ago name school. Inside this school repository I have a folder for each of my classes. I can't seem how to take this one repository and split it into a repository for each class without losing the entire history of the class, which I would prefer not to do. Suggestions?...

Git svn clone: How to defer fetch of revision history

I often have the case that I want to work on a SVN repository right away. But an ordinary git svn clone [url] also clones the entire history. So I want to speed things up. The first part is to fetch only the last revision into your Git repository. I do it like so: URL=http://google-web-toolkit.googlecode.com/svn/trunk/ REV=`svn info $UR...

Pushing a Git source tree, not just a repository.

I'm using Git wrong. I want to use it right. Here's what I've got: Over here, on my development machine is a Git repository, that I commit to and test on. Over there, is my web-server - the one place this code will be deployed. The web-server has another bare git repository that I can push to, over SSH, when I am ready to deploy. Wha...

same project, multiple customers git workflow

Hi, After my first question, id like to have a confirmation about the best git workflow in my case. I have a single django project, hosted at github, and differents clones with each his own branch : customerA, customerB, demo... (think websites) Branches share the same core but have differents data and settings (these are in gitignor...

SSH Private Key Permissions using Git GUI or ssh-keygen are too open

Recently I've been unable to clone or push to github, and I'm trying to find the root cause. This is on windows I have cygwin + git as well as msysgit. Msysgit was installed with the following options: OpenSSH Use Git from Windows Command Prompt That gives me 4 environments to try to use git in: Windows cmd prompt Powershell Git...

MacPorts/Unix/bash question

I'm new to all things shell/binary, and was installing git (I understand scm is a good thing from being on SO). My internet hiccuped partway through, however, and the installation stalled. It interrupted a tar.gz download, and I don't know quite how to resume where it left off. Here's the output: computer:~ Alex$ sudo port install git...

Is it possible to include a file in your .gitconfig

I'd like to include a file in my .gitconfig that has my github settings - is this possible? Can I do something like this: [core] include = /path/to/file ...

Git: Post-update hook that runs a script that needs access to all files in the repository

Hi everyone, I'm running into a bit of dilemma at the moment in that I need a script to run whenever the remote repository is updated (ie, whenever someone runs git push) that builds packages from the files in the repository. These packages are then placed into a directory on the git server that's exposed to clients over HTTP for future...

Using a remote repository with non-standard port

Hi, I am setting up my local git project for a remote repository. The remote repository got a non-standard port(4019). But it doesn't work, I get the following error message: ssh: connect to host git.host.de:4019 port 22: Connection refused fatal: The remote end hung up unexpectedly error: failed to push to 'ssh://[email protected]:401...

after "git rm", why is that file still present when a co-worker pulls?

I want to delete a file in a project, and I want that file to be deleted for everyone else also working on the project when they pull. When we start, all co-workers have a file "testfile" in their tree and are on the same branch. If I remove the file with: % git rm testfile % git commit -a % git push Then my co-worker pulls this comm...