I'm working with an svn repo that has about 10 branches that are each about 4 gigs in size, and it seems that when I run fetch using git-svn it wants to fetch ALL of these branches. I really only personally work with two of them, so how can I just fetch those two branches and ignore the rest? ...
Is there a way to get coloured output with git in cmd? If yes, how? Platform: XP SP3. ...
Hi Currently my website (production server) already have a lot of code in it. And now I want to start using Git for my projects and setup a staging server for my team. Can anybody give me any advise? Here is the picture in my mind: Production - Prodcution server which already have codes ↑ ...
It might be a lack of coffee, but I've just had some, so I'll go ahead and ask anyway. Here's a literal talk that I had with my terminal, with line breaks for readability. $ ls -la total 28 drwxr-xr-x 5 thomas thomas 4096 2010-10-02 09:32 . drwxr-xr-x 153 thomas thomas 12288 2010-10-02 09:30 .. drwxr-xr-x 5 thomas thomas 4096 201...
Despite reading lots of other posts regarding GIT and moved files I still struggle to understand how to trace the full history. Doing gitk myfile as suggested here seems to only show history until the previous move. I understand that GIT doesn't track files, only their content. So surely I should be able to view the full evolution of ...
Hello everyone, I'm using git for quite some time now, mainly git-svn. Now I want to convince my colleagues to switch from svn to git. But unfortunaly the precondition is that the svn repository keeps on living quite a time. So I searched for an solution an came up with the book: Jon Loeliger's "Version Control with Git" I bought it and...
I have a repository on Github that is a fork of another repository. I made some changes, and they were pulled into the original repository, and more changes have been made there since then. My forked repository is now out of date, and I want to make some more changes to it. Nothing has happened in my repository since the changes were pu...
Hi, How can I iterate through all the local branches in my repository using bash script. I need to iterate and check is there any difference between the branch and some remote branches. Ex for branch in $(git branch); do git log --oneline $branch ^remotes/origin/master; done I need to do something like given above, but the issue...
I have an app I've been upgrading to Rails 3, I've been hosting it on heroku for the past 6 months (rails 2.3.8 currently) but am unclear how to test my Rails 3 branch before I proceed. The most i could find about the subject in their docs was that I could do something like this: $ heroku create --stack bamboo-ree-1.8.7 --remote trybam...
To include a few external git repositories in my "main" repository, there are a few options: submodules braid subtree The first seems to be advised against by basically everybody. The second and third I believe are implementations of the subtree pattern. Is one better? Which should I use? Why? How can I choose between them? ...
Reading SO I still find nice, new tools for using with git. If you know any, please share it answering this question. My first proposal is: gitolite, a tool for managing access to git repositories, which is an newer version of gitosis. (Please post one tool for an answer, with short description, so we could easily comment them). So: ...
As I understand it, a git commit object will always point exactly one tree object. What I'm wondering is whether, in practice, this tree object is always guaranteed to be a git repository's top-level tree object, representing the entire state of my code at the point the commit object was created. Is there any chance, in an actual gi...
Hi, I often use git from Terminal on Mac to download some repositories and then use it. When I use this command:git clone git://git repository URL repositories are downloaded in my Start folder (name account folder e.g. Matthew, if the name of my Mac account is Matthew). I'd like to change this folder where repositories are downloa...
I have recently installed Cygwin along with the Git binaries and a copy of Tortoise Git on a fresh Windows XP install. I seem to be able to do most Git operations through Tortoise such as viewing the logs etc, but when I come to commit via Tortoise I get this message... error: unable to create temporary sha1 filename : No such file...
We recently moved our project from Google Code to GitHub, but only wanted to move a part of it (up to say revision 600) so instead of using GitHub's built-in system to transfer an SVN repo over we just created the project out of a local project folder that was appropriate. However, I'd like to transfer over the revision history up to a ...
I have a project I'm working on and am hiring contractors to help me on certain parts of the code. The catch is that I don't want any one of the contractors to see all of it. Is there a way on GitHub that I can assign them a branch under a private repository? Will this require the command line or can I do it on the website? ...
My cofounder and I are setting up our server for our startup. We're using git for our source control and the project is django sitting behind nginx via fcgi on Ubuntu. Since we're just getting started, and to make deployments easy on both of us, I have in mind to have a simple deploy script living on the server that will automatically pu...
I'm trying to set up three things: a public GIT mirror of a public SVN repo a pubilc fork of that repo where multiple contributors can stage patches a private fork of the public repo from #2 I know how to do #1 but am looking for advice on #2 and #3: how to configure, how to keep in sync, things to avoid, etc. Here's more details: ...
Hi, Do you know any tool/switch for git commands which help me prevent conflicts or speed up merges? Currently I often got "trivial conflicts" such this: ++<<<<<<< HEAD ++======= + onClick + onWakeup ++>>>>>>> 587f917... I suppose that that is caused by some white-spaces.. this is very easy to solve by human, however it requires a ...
I am currently working on a project on git-hub but our development team is using subversion. I have been doing the following to keep git-hub synced with our svn repository: git svn rebase git pull origin master git push origin master This has been working fine, but somehow I have messed something up and now I have a problem with one ...