I have started using Git in the middle of my project, where the first two commits are just some initial settings (.gitignore and .gitattributes), and the third commit M2 adds the content of the SVN trunk: I1 -- I2 -- M2 -- N -- .. -- Z I have imported the SVN history in a branch named svn, where M1 is the SVN trunk (with the same cont...
What is a good deployment strategy to use with Git + Heroku (ruby on rails)? Currently the way I work with my origin git repository: All features (or 'stories') are first checked out as branches, then get merged with master and pushed to origin. Anything pushed to origin/master triggers a script that pulls the new rails code to the s...
I've seen lots of people say you can backup git repositories by just copying them, but what happens if you are copying the repository at the same time that someone is pushing some changes up to it? ...
I want to read only the first line of a file using Ruby in the fastest, simplest, most idiomatic way possible. What's the best approach? (Specifically: I want to read the git commit UUID out of the REVISION file in my latest Capistrano-deployed Rails directory, and then output that to my tag. This will let me see at an http-glance what...
Sites like github, bitbucket provides an excellent/useful feature of "forking" projects. This allows one to simply fork a project and work on their desired features (before submitting it to the projector owner and getting commit access). How is this workflow best achieved for SVN projects (especially the various ones hosted on Google Co...
git does not seem to do what I want here so I need some advise. I have a configuration file with sensitive information such as passwords. Say I have checked in the config file with blank/generic values: username = password = Now I fill it with real values, and then add the file to .gitignore (the filename is build.properties) usernam...
In this Google IO 2009 presentation, a GIT url is provided in the slides. The URL looks like this http://android.git.kernel.org/?p=platform/development.git;a=commit; h=a42091afb7b122c753f9050ff5dbcb792eb36a78 I want to check out the code, so I ran git clone http://android.git.....rest...of....URI.shown..above But git is aborting wi...
Our project has been using git for a week or so now, and we're all enjoying it a lot (usíng it in a tight collaborative group turns out to be quite a different git experience). To keep things as simple as possible, we do not do any rebasing or history modifications. But we did make a few mistakes in the first week. A few commits were mad...
Hi Guys, I have justed installed openSSH and I am having trouble with the server URL for SSH. When open a bash - I can login successfully as ssh [email protected] In this directory I have /Git - which is the folder storing my repository - however when I try ssh [email protected]:/Git I get ssh: Could not reso...
I want to restart my virtual server after switching branches, and tried adding some aliases in my .gitconfig but did not get it to work. co = checkout | !rap only runs rap, the restart script. co = checkout && !rap and some other things I tried (like checkout $1) gives my "git usage: bla bla". ...
As a Git newbie, I realized that I have been using it as if it were Subversion. e.g. always working on master, not committing locally before pulling changes etc. This often results in avoidable manual merge situations. What are other common antipatterns of using Git? ...
Hi Guys, So I have SSH working now no problemo and I have setup a new git repo in my /home/Tom/Git/myapp.git I provided access to another drive for hosting the repo so the directory "Git" actually exists on D:\ using ln -s /cygdrive/d/Git/myapp.git Now when I attempt to clone my git repo using ssh://name@ipaddress:port/...
Hi, Here is very simple question for experienced Git user. I've created repository on git hosting and set up mine pc: git init git remote add origin git@*.sourcerepo.com:*/ *.git Then, after some changes I do: git add . git commit git push All these actions are done on first developer pc. Now the question: How does second develop...
So I thought I had finally got everything setup on Windows ... then ran into this issue. Current setup URL: ssh://user@host:port/myapp.git Already run Putty - and can connect using valid .ppk keys through the ~/.ssh/authorized_keys direct. In Git and TortoiseGIT - I set both to use "plink.exe". Putty works fine - no issues - but ...
I'm modifying an open-source project that's stored in an SVN repo. Since my changes will likely take a while to complete, I've checked the project out as a Git repo using the git-svn bridge. I don't have access to the project's Subversion repo so I can't push changes back to it, but I'd like to publish my Git repo (on GitHub) so others c...
Disclaimer: Things would be simpler had I known about git-svn at the start. I had a large codebase in SVN, and crudely got it situated in git. Work life was very painful without fast, efficient branching, so this was all accomplished in a bit of a rush. My process was: svn export git init . git add . git commit -a -m "initial commit"...
I cloned my GitHub repository here at home, and obviously screwed something up. Anyway, I made a lot of changes, or I'd wipe out the directory and do it all again. First of all, when I do ssh [email protected] I get the following: PTY allocation request failed on channel 0 ERROR: Hi asdfadfs! You've successfully authenticated, but GitHub ...
I've been wondering what is the better DVCS for .NET developers? From reading various information it has sounded like Mercurial works better on Windows, but other information claims that Git has caught up and surpassed Mercurial in offering quality Windows and Visual Studio tools. Does anyone have good recent information or experience ...
Hi, I delete a file in my working directory. And then I do a 'git pull'. Another person in my team modify the same file and 'git push' to the HEAD. So when I do a 'git rebase', I get a merge conflict something like 'CONFLICT git (delete)' My question is how can I find out what changes did the another person in the team made to the fil...
Hi, So I seem to have some real issues setting up msysgit. I can connect via putty to my SSH directory using ssh://user@host:port And I have the correct keys. I can also do this using plink via the plink -P PORT user@host -i /path/to/private_key.ppk When I attempt to run (via TortiseGIT) or via a git bash git clone ssh...