freephile

#!/usr/local/bin/php
<?php
/**
 * Pre-commit Subversion script.
 *
 * @author Greg Rundlett <info@eQuality-Tech.com>
 */


/**

freephile

I forked the drupal project from git://github.com/mikl/drupal.git (my "origin") so that I could start with official upstream drupal sources.  I then created my own private remote repository that I can push to (iic-drupal), and have made a number of commits (using a different computer).  Now I'm on a machine where I want to pull from iic-drupal, but if I do 'git pull' it complains (see below)  This gist describes how I fixed my configuration, and clears up for me how in a DISTRIBUTED VCS, you need to tell the system which local branch you are working with, and equally important, which remote AND branch on that remote you want to pull code from.


$ cat .git/config

[core]                                                
        repositoryformatversion = 0                   
        filemode = true                               
        bare = false                                  
        logallrefupdates = true