I have a repository in git. I made a branch, then did some changes both to the master and to the branch. Then, tens of commits later, I realized the branch is in much better state than the master, so I want the branch to "become" the master and disregard the changes on master. I cannot merge it, because I don't want to keep the change...
Hi all! I have done an app for a client called 'A' (not really). I have found out that it is very cool and that I want to sell it to other clients also. The directory 'A' is a Git repository. I think I have a problem with cloning it. As far as I can see I need to make a copy of the dir 'A' and call it 'Generic_A'. Then delete the dir '...
I am aware of this question, but it is a bit old now, and some of the answers seem outdated. Question: please write one answer per GUI you have used, including pros and cons (for example, as far as I can tell, with git gui, you can't manage the stash). ...
I've followed the Tim's article (mentioned in the answer to this question), but - like many others, it seems - I'm stuck when trying do the test clone at the end. I get the fatal: the remote end hung up unexpectedly error, even though my $HOME path seems to be right. Anyone got any pointers to where I might start for debugging this? My ...
I'm trying to clone a local git repository. The repository's name contains a `:'. This is confusing both me and git. I get the following error: ~/work/c% git clone ../a::b . Initialized empty Git repository in /home/user/work/c/.git/ ssh: Could not resolve hostname ../a: Name or service not known fatal: The remote end hung up unexpected...
Hi. What can I do to import a SVN repository into git but only from a (known) revision number and onwards? I've tried with: git svn clone --authors-file=/home/ubuntu/svn-git-users.lst --revision=4151 -T trunk -b branch -t tags file://`pwd`/../svn-server-sync/MyRepo MyRepo But it fails with: r4151 = e80c7c5923700d6c7594c91f1727...
I have been searching for a solution to this for a while and have not found quite what I need. I have several Git Repositories in a folder on my Mac (OSX 10.6) and would like a script or tool that will loop through all the repositories and let me know if any of them needs "commit"-ing. This is my structure Sites /project1 /pro...
I tried looking for a an answer to this, but couldn't find any which address this specific need. Which is weird. I want to be able to do the following: create a local branch based on some other (remote or local) branch (via git branch or git checkout -b) push the local branch to remote repo (publish), but make it trackable so git pull...
I'm using eclipse 3.5.2 and cannot seem to use "filter resources" to filter out .git folders in any of my projects for any of my perspectives: javascript, ruby, and php. I've tried adding the filter to plugin.xml as suggested on this blog but it is for eclipse 3.4 and doesn't seem to work. Any suggestions? ...
Is it possible to create an archive of my current repository including local uncommitted changes using git archive? ...
Here's my setup... Laptop (Mac) - git clone of svn repository Thumb drive - git clone of laptop git repository Server (Win Server 08) - git clone of thumb drive repository I'm having trouble keeping them in sync for some reason... If I make a change on the server, I'll do a "git pull " on the thumb drive to get the changes. Take th...
Working on a bit of a sticky problem and was hoping for some help from the community. Basically, our dev team is split up into two teams, lets say "Red" and "Blue" 3 repos: 1: Master 2: Red >> Clone of master 3: Blue >> Clone of master Each developer is cloning red or blue on their local machine where they are working. Both teams...
http://github.com/creationix/node-git Reading blog posts from a repository. If not, how would you do it (chaching, ...)? ...
I had a boss, past-tense, who decided to put svn branches in the same folder as trunk. Normally, this wouldn't affect me that much but since I'm using git-svn things are going so well. After I did a fetch it created a folder for each branch in my root folder so I have three folders, drupal, trunk, and client. The drupal folder is git's m...
on git svn dcommit it starts commiting and then I get this A spec/controllers/authenticated_system_spec.rb A spec/controllers/sessions_controller_spec.rb A spec/controllers/users_controller_spec.rb A spec/fixtures/users.yml A spec/helpers/users_helper_spec.rb A spec/models/user_spec.rb A vendor/plugins/haml/init.rb A ...
I have a Ubuntu server which I want to be my continous integration server (for the Zend Application based projects) and the staging server as well. The team is pushing source files to the repository: /home/git/repositories/testing.git Then Hudson does the build, and the master branch is exported (maybe cloned is a better word) by git...
I am running a PHP - MySQL website, and have set up a remote repository on my own server using Git. I now want a way to be able to have a production and a test server, and some how be able to push my changes from dev to production easily. and seamlessly. ...
At work, we are using SVN, CVS, and GIT because there any many projects that were started at various times. Anyway, a common sequence that occurs is as follows: Working on task A, making changes to project Has new task B, some bug or functionality needs to be done on project, independent of task A but may affect same set of files Check...
Is there a way to , when doing git commit to not display the untracked files in my $EDITOR? I know how to do so in the shell, using git status -u no, but I'd like do it in $EDITOR as well EDIT: I should have stated, I do not want to ignore these files forever, just not see them on certain occasions... ...
Hi, I'm currently trying to convince my company to migrate to git from subversion, and one thing that would be really helpful would be to allow me to store a repository in subversion and git at the same time (then I can show them how easy it is to do in git what they've spent an hour trying to do in subversion). I guess that I could put...