I'm running git 1.7 on Mac OSX, installed via Homebrew. I'm trying to use git svn to work with a Subversion server that requires Subversion 1.5 clients (a restriction enforced via a pre-commit hook.) Running git svn --version reveals that as far as git is concerned, git svn is equivalent to svn v1.4.4. I can't establish whether git svn...
Hi, I read this about git branch: http://book.git-scm.com/3_basic_branching_and_merging.html so I follow it and create 1 branch : experimental And I 1. switch to experimental branch (git checkout experimental) 2. make a bunch of changes 3. commit it (git commit -a) 4. switch to master branch (git checkout master) 5. make some changes...
I've got two branches from my master: v2.1 (version 2) I've been working on for several months; wss that I created yesterday to add one specific feature to my master (in production) Is there a way to copy yesterday's commits from wss to v2.1? ...
I often read that Hg (and Git and...) are better at merging than SVN but I have never seen practical examples of where Hg/Git can merge something where SVN fails (or where SVN needs manual intervention). Could you post a few step-by-step lists of branch/modify/commit/...-operations that show where SVN would fail while Hg/Git happily move...
I read this about git branch: http://book.git-scm.com/3_basic_branching_and_merging.html I have create a branch called 'experimental'. I switch to that branch and make 2 commits there. So if it possible for me to merge the later commit (the 2nd of the 2 commits) of the experiment to the master branch? Thank you. ...
I have a branch that I would like to rebase onto the lastest commit on my master. The problem is that one of the intervening commits on master was to delete and ignore a particular set of files (see this question). If I just do a straight rebase, those files will get deleted again. Is there anyway of doing this, inside git, rather than...
How to I add something to the .gitignore so that the match is not recursive? For example, I wish to ignore the directory foo and the file bar.txt in the current directory, but not any that exist in subdirectories. I have tried this for my .gitignore file: foo/ bar.txt But unfortunately git applies this recursively, so that otherdir/...
I'm in a position where I'm the only one using git, everybody else is using svn. I've used 'git svn' to connect to the team svn and mostly it works just fine. Lately, I've started a project initially on my own, separate git repo and now I need to merge stuff from it to the svn. However, I still would like to keep tweaking the implementat...
our svn had so far traditional layout: trunk branches/ tags/ i cloned whole the repository long time ago and everything worked perfectly. but few weeks ago someone figured out that particular releases should go to releases/ instead of branches/ so the layout changed to following: trunk branches/ releases/ tags/ is there...
I am currently working on ClearCase and now migrating to GIT. But we need this migration in a way that all work will be done in GIT and the data will be synced backed to ClearCase stream. We will have the same branch names and stream names in both GIT and CC, so scripting shouldn't be a problem. The problem here is, Can someone suggest ...
Hello all, I have been using Git for my version control for a while now, but I have as of yet only used the single master branch for all of my development. As my projects are getting bigger, it's time I being worrying about stable/development branches and release tagging. I have been reading a bunch of articles about Git branching, but ...
Is it possible to exclude specific files (*.ai, *.psd) when pushing to certain repositories with Git? My need comes from trying to use Git for both version control and deployment to Heroku. If I include my graphic assets in the deploy, the slug size is larger than desired. However, I do need to include all project files in my main gith...
Hi everyone, I use git for my local work (and love it ever so much), and I follow a workflow similar to the one described in this article. So basically, when starting on a new feature, I create a branch for it, go through the usual hack then commit cycle, and when I think I'm done with it, I squash it into a single commit using git reba...
I'm using git to version my home directories on a couple different machines. I'd like for them to each use separate branches and both pull from a common branch. So most commits should be made to that common branch, unless something specific to that machine is being committed, in which case the commit should go to the checked out, machi...
I am trying to update all of my Textmate bundles to the most current version. Is there a way to do this without doing each bundle individually? If not how do I update an individual bundle? I don't know how to use svn so I would prefer to use the git repository. Thanks for helping a noob! :) ...
I'm working on a project where I programmatically need to know when a URL has been changed by a developer, post or during deploy. The obvious answer may be to curl the URL one day, save the output, then curl again in x days and diff the two. That won't work in my case, as I'm only looking for changes the developer made. If the site is...
Somewhat new at Git.. I am working on a project, and had all of my tests passing on the master branch. I then made some changes, and when everything started failing, I realized that maybe I should have made those changes in a different branch. Is there I way I can commit the changes to a new branch without commiting them to my master ...
Say I have a file called: "todo" It's a list of things I want to do for this project. I want this file associated with my git repo. I want there to be different revisions of this file, however, I don't want it associated with particular branches. For example: On branch master. Create some basic ToDo items Branch "dev1" Add more stu...
After cloning an SVN repository using git-svn with the -s option (git svn clone http://server/repo -s), how does one create a branch or tag and have pushed to the relevant branch/tag directory in the repository when dcommiting? For instance; if I were to use git to create a foobar branch locally (git checkout -b foobar) how can I have g...
My boss is interested in using MKS Integrity for bug tracking, feature requests, Wiki documentation and so on. However, we currently use Subversion, and he doesn't want to force us devs to use a version control system that we don't like. Is is possible to integrate a different version control program into MKS Integrity? I'm particularly...