I'm looking for a tool that I can use to deploy my PHP web applications. I want to be able to work locally, then when ready, deploy to the server and create a sym link to the new one, in case it doesn't work I can go back and change the sym link. I know there are some like this that use Subversion, but are there any that use Git? ...
So I'm trying to get hudson to build with a post-receive hook. In my local git repo I set post-receive.sample to just post-receive, chmod 755 and added in the line: /usr/bin/curl -u user:secret http://localhost:8080/hudson/job/MyJob/build?token=secondsecret If I force a build, hudson updates the code, but here's what I don't understa...
I have a 3 projects I'd like to fork. They're all related to each other - changing one will likely require a change to another. Because they're all related, I'd like to create 1 repository for the forks, while maintaining the ability to pull down updates from each original. How would I setup my git repository? These are preliminary th...
What system does git-config use to manage configuration? Is it something that's publicly available as a stand-alone library/tool? or is it tightly interwined into git? I'd like to have something like it for my project. Is there a library that I can use which provides similar functionality? Or should I just write my own tool/library? ...
Let me explain the problem in detail. I have a main git branch on which I created a new side branch bug10101010, now I wan't to merge the bug10101010 to main. So far everything is good. Now I have a different branch of the same product, named legacy. I wan't to merge the bug10101010 to the legacy branch in GIT. Any ideas? I can't just...
I've got several Subversion repositories for which I'm the only committer. Based on Paul Dowman's excellent instructions, I did the following: $ git svn clone https://localhost/svn/settings --no-metadata -Aauthors.txt Initialized empty Git repository in .git/ ... r1000 = 8655353158ef2e7be84c0115b16a14d327e9e842 (git-svn) Running git rep...
I'm working behind an http proxy. I'm trying to clone Android's source tree using their "repo" tool. This tool insists on using "git://" URLs, even though "http://" URLs also work. This results in me not being able to download the source. Is it possible to force git to always use http URLs? Thanks. Edit: my http_proxy is configured ...
I need to generate a patch of commit with respect to its base. A tag has been marked on that commit. So like on 939023 I do a commit and now it becomes 213232, I will tag 213232 with a label. Now given the label, I need to find out the diff between the 213232 and 939023. I mean I need a way to generate a diff of any commit whose label i...
Hi, I wanted to have a simple solution to squash two merge commits together during an interactive rebase. My repository looks like: X --- Y --------- M1 -------- M2 (my-feature) / / / / / / a --- b --- c --- d --- e --- f (stable) That is, I have a my-feature branch that has ...
I'd like to keep Git repositories on four machines synchronized, and all of them are private repos. Is it possible to set up a single Git repository to pull from the other three machines at the same time, with all the changes attempting to merge with a single branch locally? ...
using visual studio 2008, 9.0.30729.1 SP1 Installed (msys) git, git versin 1.6.5.1.1367.gcd48, git-gui 0.12.0.23.ga91be. i have the GIT menu in the menu bar, and git icons in the toolbar, but clicking them doesn't have any effect any more. It worked before, on my previous laptop. But that was probably a (little) older git version, and m...
I am a beginner in using Rails and Git I have InstantRails installed and created an app by: $ rails myapp It created all the necessary files. I went to the directory, $ cd myapp then I tried initializing git $ git init but it said : 'git' is not recognized as an internal or external command, operable program or batch file. So I fi...
Apparently, when you move a function from one source code file to another, the git revision log (for the new file) can show you where that code fragment was originally coming from (see for example the Viewing History section in this tutorial). How does this work? ...
I would like to access (clone/push/pull) a private (via ssh) git repository while behind a corporate firewall that only allows http proxy access. I have written a robust Java (daemon) program (based on the JSCh class library) that will allow me to leverage local and remote port forwarding and I am hoping to leverage this but my brain hur...
Hi everyone, I would like to combine many commits in to one. I have followed the method described at a previous StackOverflow answer which says: # Go back to the last commit that we want to form the initial commit (detach HEAD) git checkout <sha1_for_B> # reset the branch pointer to the initial commit, # but leaving the index and work...
This seems like it should be simple, but I can't figure it out. I'm happy to use the website or the command line. EDIT: Say there is some repository/user named foo on GitHub, and there is a project named bar. So, you could go to github.com/foo/bar I would also like to create github.com/foo/bar2 Sorry for my ignorance... I'm making th...
I understand how to merge branches together in git, and I love how easy it makes it. I have a branch that looks like this: project/ |--subproj1/ | |---(files) | |--subproj2/ |---(files) A colleague has a branch that's made significant changes to both subprojects. More specifically, he's altered them both to depend on a common bit...
As a recent convert to git and a long-time Emacs hacker I'm wondering what other serious Emacs/Git hackers recommend for git support in Emacs23. I've already started using the VC git backend and find it somewhat of a thin abstraction layer of git's capabilities. So I'm inclined to try another. Googling turns up a half dozen or so choi...
I think I might be asking something weird/wrong here, but I'm new to git so bear with me! I have a development clone and a live clone of a git repository, pushing from development and pulling to live. I'm having a problem in that configuration files need to be changed once they get to the live working copy. This was all working fine unt...
I am trying to use a program that uses git as the backing store (I am new to git). On initialization, this program does a: "git" "--bare" "rev-parse" "refs/heads/index" Which results in: fatal: Not a git repository: '/home/david/blog.git' I followed this tutorial, git init, git add test.txt and git commit. The repo seems to behave ...