git

Can Git pull from one Subversion repository and push to another Subversion repository?

I have a development team working on one SVN repository and another team working on another SVN repository. The projects are similar but slight different hence 2 development servers. Occasionally I would like to push and pull some features from one team to another. Can Git do the job? Any suggestion on how to go about it? (Git beginn...

git working on two branches simultaneously

Hi, I have project with many branches. I would like to work on these simultaneously without switching back and forth with git checkout. Is there any way I can do that besides copying whole repository somewhere else? Thanks. ...

VCScommand for VIM

I am trying to use HG (Mercurial) with the Vim VCScommand plugin, but am running into a problem "Too many matching VCS: git HG". I removed the vcsgit.vim and the HG binding seemed to work. I thought VCScommand used the folder to determine, which VCS one was using. I guess this is a flawed assumption. ...

Git hooks management

We use custom-written Git hooks in our project. Hooks are stored in a project's repository, and, when they do change, to get a new version each user must copy them manually in his .git/hooks directory. This is rather inconvenient. One way to improve this is to make .git/hooks a symlink into worktree. But this would imply that each bra...

git - How to undo a "git repack -ad"?

I have a git repository that i have packed with git repack -a -d, this repacked all the objects into one big file. This saves space. However I want to undo this, and turn that one big pack file into all the little object files. The reason I want to do this is to backup the git repository to a remote server. I did a backup (before repack...

Git-diff to HTML

Hi, I'm looking for a way to produce HTML files from a git-diff output, preferably using python. I've been looking at http://docs.python.org/library/difflib.html without being able to figure out how to use the git-diff output as an input. Any clue? Many thanks ...

How to sync to a source tree on github?

I am playing with my eclipse cvs functionality (on my windows box), is there a way to check out a project hosted on github? Anyone shows me a pointer? Thanks, ...

git svn rebase problem on windows

Hello, I have a problem with git. Basically, here is what I have. I access a svn repository through git. Until now, on python files, everything worked fine. But lately I also added some pyd, dll and lib files on the repository. THe first update went well. But then, these files have been modified and since then I can't update. These fil...

Free hosting service for private and public git repositories

Hi, does anyone know a free service for hosting private and public git repositories? There are a lot of services like for example the well known github. Most of them only allow hosting of public repositories. I want to host one or more of my private programming projects using git, but not all of them should be public (at least not for ...

Git equivalent of subversion's $URL$ keyword expansion

I am considering migrating from subversion to git. One of the things we use subversion for our sysadmins to manage things like configuration files. To that end, we put $URL$ into each file, which expands to the file's location in the subversion tree. This lets the admins look at a file on some arbitrary host and figure out where in the t...

Using the pre-commit hook to clean code

Is it good form to scrub development code from my source files during a pre-commit hook? For example, I have code that is calling xdebug_break() and I want to remove the calls to that function from any files that have it before committing my code to the repository. I would rather not check for the function before calling it because I ...

git is not detecting changes in some files

I have managed to get my index in state where some files aren't tracked as expected. As an example I have size.h and test.h unmodified in the working directory: $ git-ls-files -st size.h test.h H 100644 de2c741b07d86f92bdd660626848072cb2bf510f 0 size.h H 100644 8bb24bc7483ffcfc0fc1a3761dc63e86a1b3e003 0 test.h $ git status # On...

Using Git on Windows

What is the simplest (to install and use) git client for Windows nowadays? ...

Version Control and Deploy Rails Project with cPanel

In my server, what option i got is a basic unlimited server can host unlimited rails project possible to manage gem because it is using cpanel latest version with a ssh now my confuse is , how can i use the no ssh feature in the cpanel and ease my deployment ? i don't know is that possible to use the capistrano and git with it any guid...

Can I use git to keep a remote server up to date?

I'm using git to track a project, and if it's possible, I'd like to set things up so git handles all my code staging, I can have a local repository for testing, and then push changes to the server with git to make them live. However, in trying to use standard git push calls, I just end up with inconsistent branching and a terrible mess o...

How do I create a git repository over an eclipse project or vice versa?

Hi. I have a git repository that is just a directory tree (/myprogram/src/com/mycompany/test) with some source files. I wish to create an eclipse project around this repository. Both orders of create project in eclipse and git clone <url> <myprogram> from the command line give me a "folder already exists" error from whatever tool I us...

Checking out the branches of a git repository into sub folders?

Is it possible to take a repository (such as CakePHP1.x @ http://github.com/cakephp/cakephp1x) and checkout the master plus branches into sub-folders? For example, my desired folder structure would be like this: cakephp1.x |------ 1.2 |------ 1.3 |------ master I know you can use git checkout -t origin/branch to swi...

Source Control - If, Why, How to start?

Possible Duplicate: Using Source Control So, although even here on stackoverflow are literally dozens things on version control, i can't find something nice to answer all my questions. If you have anything to say or post a link, please do it here. 1., Do I need to start with version control? While most people agree, that even ...

GIT and VSTUDIO: Does visual studio cache files and cause issues when switching between GIT branches?

Use case: -Visual Studio is open -Master branch is clean (confirmed with git status) -Checkout clean feature branch (confirmed with git status) -Make changes in feature branch using visual studio IDE -Commit Changes in feature branch -git status check, everything commited to feature branch -Checkout Master branch PROBLEM: M...

Using two git repos in one folder

Hi! Here's the scene: I'm currently working on my own framework and on a client's website. Here is the structure: . .. _application _framework _public I'd like to have a repo with _framework/* _public/index.php and the structure _application (empty folders for _controllers _models and _views) on github. Also I'd like to have a repo c...