git

Which SCM can comfortably handle 90,000 files

I have a folder which contains a whitelabel-esque system; theres way over 90,000 files in there. Currently its stored in SVN and we just checkout the sub-folders as required. Would mercurial or another SCM be able to handle having the lot checked out at once without it dying when you try to commit. ...

git archive - Multiple gits

I am using git archive with --remote option to archive multiple gits ,are located under one folder. I want to include those folder names of four gits and if .gitattributes is available in those gits that should also be taken care during the archive. With git archive --worktree-attributes --prefix=source --remote command I didn't get the...

Change repository from Subversion to git ??? And what is pros and cons of this repository

Possible Duplicate: Why is Git better than Subversion? Hello All, I am making an application and im currently using subversion, but i want to switch it to git. Is this right that git is more helpful than subversion. Which one better for me to use Also any doc or video help for me. Please send your valuable thoughts and links...

do a git cherry-pick in multiple branches

Hi all, sometimes i have the situation that i discover a bug and correct it and then commit the changes. This commit can be cherry-picked in all affected branches, a feature that i really like. But it turns out to be tedious ( check out affected 5-10 branches, pick commit ) or error-prone ( cherry-picking when working on that branch - ...

getting android source for android.hardware.Camera

I have been trying to find the source for Android's Camera class so that I can examine how it calls the drivers that it is supposed to interface with. The API that android provides is insufficient for my purposes, and I am hoping to be able bypass that API. However, I am having trouble finding any documentation, and am resorting to acces...

git move a branch's start forward in the tree

Okay I almost have this rebase thing figured out. I can feel a breakthrough coming - here is the tipping point: How do I do a rebase to go from: A - - B - - C - - D - - E (HEAD) | \ - - F - - G (branch1) To: A - - B - - C - - D - - E (HEAD) | \ - - F - - G (branch1) I don't just want to merge H...

Configuring 'git help' to open kernel.org reference

I've got git installed on my mac and either forgot or decided not to install the local docs. On my windows install however, when I use git help command it actually opens the corresponding documentation on kernel.org. Can this be configured for my mac install as well? If so how? ...

Heroku error: "Permission denied (public key)"

I keep getting this error. I am using Mac. I generated a key and added it to heroku using heroku config:add key="ssh-rsa [email protected]" But this doesn't work. I keep getting the same error. Short of reinstalling ssh-keygen, what can I do about this? ...

In a git-based CMS, how to uniquely identify files in git repository?

I'm working on a simple CMS (based on Django, not that it matters) similar to Jekyll and Hyde, but dynamic instead of static. The idea is that the server has a copy of the repository, I can push stuff into that, and the CMS will automatically pick up the new content. Let's say that Markdown-formatted blog posts in my repository follow t...

Alien::SVN build error on HP UX 11.23

when trying ./Build on HP-UX 11.23 to install Alien::SVN, it exits with message: checking build system type... Invalid configuration `n': machine `n' not recognized configure: error: /bin/sh build/config.sub n failed configuring SVN failed at inc/My/SVN/Builder.pm line 108, <STDIN> line 3. Something went wrong with the Subversion config...

Capistrano uploads the .git directory

I am using git with capistrano. I initialized my project inside my folder on my local machine as such: git init I then pushed the project the server directory I then called cap deploy The deploy works, except that it uploads the local .git folder structure, as well as my .gitignore and Capfile to a publicly accessible folder. Here's...

where are the source files after fetching a git repository

I just installed Git and fetched a repository from gitorious.org. The fetch was successful according to the git gui application. However when I look in the directory where I set up the local repository, there are no source files. I have H:\dev\qt\.git. Under .git folder there are a bunch of subfolders and some files. There is nothing un...

What are some methods for keeping track of Xcode projects in source control?

In the early stages of a project when lots of files are being added and the project is being worked on by more than one person concurrently, Xcode project files tend to come into conflict often under source control. Merging those is a pain and often results in lost file references if you're not careful. Has anyone worked out a tried an...

Can't use git with aptana

When i try to put something on a git server it's givin' me an error: "Reference to undefined variable USER" In bash: echo $USER giving me correct answer. What could it be? It's eclipse with aptana-3 plugin (a whole pack) ...

Git remote repository (with files?)

Hi, I have a remote web server that I have full access to (ssh, git, etc.). I want to be able to edit files on my computer and push them to the remote server. When I use a bare repository it doesn't change the file, but when I use a non-bare repository it complains with the following message: remote: error: refusing to update checked o...

How to clone git repository with specific revision/changeset?

How can I clone git repository with specific revision/changeset? Something like I usually do in Mercurial: hg clone -r 3 /path/to/repository Thanks! ...

Easy to use revision control for one person

I use revision control tools to handle ever changing versions of my webpage, LaTeX documents, as well as actual source code, but I don't think I'm doing it right. I used cvs for a while, then git more recently, but I'm not really happy with them, possibly because I'm using them incorrectly. I'd like some advice on how to use them corre...

git merge: apply changes to code that moved to a different file

I am attempting a pretty beefy git merge maneuver right now. One problem that I am coming across is that I made some changes to some code in my branch, but my colleague moved that code to a new file in his branch. So when I did git merge my_branch his_branch, git did not notice that the code in the new file was the same as the old, and...

Gitosis noob question - user / repo / ssh related

Hey guys. As a fresh git user, I tried to install git on a server following this guide. For... like 3 days in a row. Here was the problems: I followed that guide exactly. But when I came to 'Creating new repositories' section i was blocked. I simply can't understand how can you add users to a project. I mean, ok, I need a SSH key. B...

How to prevent successive commit on specific file on git?

I have some configuration files to commit on GIT with default parameters. Users can pull these files and can modify them on their local copy but they must not commit/push. How can I achieve a similar result? the file gitignore doesn't fit my need because file must be commit only the first time ...