git

How do you gitignore everything except a directory?

I am trying to sync my desktop and laptop using a cron'd git. It works beautifully on a single directory. However I want to sync multiple config files scattered about and some other things. To do this decided to turn my home folder into a git directory and ignore everything except for a few select files and directories. $ cat .gitignore...

how to get trunk code from repository? (redmine,svn)

I am using turnkey redmine and I can log in and do stuff so everything is working fine. I need to test some features from the trunk and I have no idea how I can install redmine from trunk repository both & svn clients are working from the command line. ...

Merging two git repositories together with Django web server, one developer.

Hi experts! I started my Django project locally and have been using git just fine. I got ahead of myself and copied the code to the server which instantly became out of sync with my local version. I hadn't done a branch or anything. The two part question is what's the best structure for me to work locally, push/pull to test server ...

git-svn vcs switch: where are my branches?

I converted a very large svn repository to a git repository with git svn init svn/server/project --no-metadata git svn fetch This took the better part of two days to finish. This repo should have quite a few branches but when I do "git branch" I get nothing but the master. They are listed under the branches directory, but shouldn't ...

Is there a convenient way to include a mysqldump in my git commits?

Especially if I'm using GitHub? If not, should I (or perhaps someone else) work on such a tool? ...

Mark a file in the GIT repo as temporarily ignored.

We're migrating from Perforce to GIT. In perforce, there were some files that I'd want in the repository, but they shouldn't be checked in by individual developers regularly. Things like eclipse project files. Each dev might get the initial .project file, but then tweak it slightly for their environment. With P4, I could take those...

GIT-SVN clone command executes without errors but the local master branch is missing

I'm trying to use GIT-SVN but I'm having problems getting things started. I can clone the svn-repository (or use git svn init and then git svn fetch) without any errors but after the command stops processing, the git repository is empty and there's no local master branch. My svn repository is located in here: https://localhost:8443/svn...

Will git-rm --cached delete another user's working tree files when they pull

I wish to stop tracking files but still keep them in my working tree. I've gathered that git rm --cached FILE will let me do that. However, if someone else pulls this change, will their local copies be deleted? ...

How can I compare two versions of software, one of which is in a GIT repo?

I using a vendor modified version Linux which is based on a 2.6.14.* (more specifically than that, I don't know which) version of the kernel. I'd like to forward port the vendor kernel changes, but first it makes sense to me to see what changes were made. I've cloned the linux git repo: $ git clone git://git.kernel.org/pub/scm/linux/...

git: can i commit a file and ignore the content changes?

every developer on my team has their own local configuration. that configuration information is stored in a file called "devtargets.rb" which is used in our rake build tasks. i don't want developers to clobber each other's devtargets file, though. my first thought was to put that file in the .gitignore list so that it is not committed ...

Where is the Git Repository Path created?

When one creates a NEW repository with Git, does the path where the .git subdir is added have to be the SAME one as the path where the project files are (i.e. the files to be managed by Git)? Another way of asking the same question is: If I want to create a new Git repository, does the repository path always have to coincide with the re...

DVCS with "named commits"

Hi, I'm looking for a DVCS which would allow me to use something like a "named commit" -- similar to what patch queues achieve, but not quite... (I'll compare only to mq and stg, since I don't know of any other similar ones) Patch queues are close, but I'd like those features: Creating new branch in the repository, branches also the p...

Issue with cloning from user to user on the same server!

I'm working deploying rails applications. I setup Gitosis on my server. Git user is up and I'm already have 'deploy' user on the server! I was 'git clone' to my local machine from the deploy user on the server. After setting up Gitosis, I'm also able to 'git clone' from the server(git user). What I want is to 'git clone' from 'git clon...

Most robust way to convert a CVS repository containing Eclipse projects to git?

I have a situation where I have an elderly CVS repository which we would like to convert to git once and for all while keeping full history etc. All folders at the root of the repository contains Eclipse projects (either plain or dynamic web projects) including .classpath and .project. We use Team ProjectSets to check out the projects ...

git hooks bash -- getting the commit message.

I am writing a git hook, to run on a commit to the main branch. I need it to parse and look for some text in the the commit message. How do I reference the commit message in my bash script? Also I would like to know how to run the hook only on commits to the main branch. so developers can quash there local commits and commit to the mai...

git alias with positional parameters (git foo aaa bbb ccc => foo aaa && bar bbb && baz ccc)

Basically I'm trying to alias: git files 9fa3 ...to execute the command: git diff --name-status 9fa3^ 9fa3 but git doesn't appear to pass positional parameters to the alias command. I have tried: [alias] files = "!git diff --name-status $1^ $1" files = "!git diff --name-status {1}^ {1}" ...and a few others but those did...

Easy merging in svn using git-svn

At work we are using a lot of branches in SVN and there are problems in merging. I heard that a good idea is to use git better merging with git-svn. I try to play with it using msysgit, however its not as easy as it seems. I know I can checkout the whole project using git svn clone -s, however it does not see branches(as normal git bran...

Push from github to heroku without downloading repo

I have a github repo that I want to push to a heroku node. A 3rd host will be co-ordinating this. As I'm going to be doing this on a large scale I want to avoid having to download the contents of the repo onto the 3rd host. How do I do it? ...

Compiling workflow with version control

Up till now I've used version control for simple web-based projects that don't really have a compile stage. I've now forked a relatively large project that follows the standard "./configure; make; make install" pattern. I'm unsure about the proper workflow for this type of project. What do I do with all the created files from the comp...

Eclipse Android and gitignore

What files/folders can I safely ignore for inclusion with git? I copied a good project, removed its gen and bin folders and tried to run the app. The Android Launch window says, "Your project contains error(s), please fix them before running your application. There is a red X on the icon to the left of the project in the Package Explore...