I've got a repository on GitHub (http://github.com/hrickards/PHP-Crypto) for a little project me and a couple of others are working on. My development environment is Aptana Studio, and I use the EGit plugin as Aptana is basically Eclipse underneath. Today the designer sent the HTML and CSS for the website with the images in a folder name...
I'm working to deploy a Django app. The app built on a Github OS project. I have this stored locally as the Master branch. $ git branch * master customized - customized with local dev settings webfaction_customized - with production server settings The customizations for this project are stored in 2 separate branches. My ...
We'd like to use git to maintain system configurations. Because sometimes configuration data exists outside of /etc, we've started doing something like this on our systems: # cd / # git init # git add etc # git add some/other/path # git commit -m 'initial import' And so forth. This works, up to a point. As long as your cw...
Do you think I will have any kind of problem by using different git software versions between the remote and local copy? In my case the remote is 1.6.5.7 and the local is 1.6.5.1 (few bug fixes) Thx ;) ...
Hello, I'm trying to set up a git post-receive hook such that when a commit is received, another clone of the repository on the machine gets updated (i.e. does a git pull origin master). I'm using gitosis to serve the repository and as such I believe a post-receive hook will be run as the gitosis user, whereas the repository I want to u...
Hey All, I searched all of the relevant Capistrano issues, but couldn't find something that even elucidated anything here for me. git version 1.6.4.2 Capistrano v2.5.10 Basically, when I run my cap deploy.rb script, it connects to the server, starts executing the deploy:update task, then in the deploy:update_code task: *** [...
Is there a tool that allows me to gain the same functionality as git-svn for Perforce? I saw git-p4 on github but it looks like this imports source from a git repo to a Perforce repo. Does it go the other way around? Is it intended to be used as a frequent tool or just a 1 time, import-only type of tool? Scenario: I am a contractor,...
I saw an answer to a question here that helps restore a deleted file in git The solution was git checkout <deleting_commit>^ -- <deleted_file_path> What does the caret character (^) do? I've seen it elsewhere doing very useful things in git. It's magical. Someone please spoil it for me and tell me what it does? ...
we are using git on a lan of computers and we have a central repository on one machine, every developer has to clone the repository and work on his one machine. but how to merge all this repositories together in the central repository ? ...
I keep my bare repositories on an AFS file server, mounted locally. When I clone them, I do git clone --no-hardlinks file:///afs/whereever.foo.bar/myrepository.git I frequently get the following: warning: remote HEAD refers to nonexistent ref, unable to checkout. and no files. This is easily fixed with git branch master or...
Is there a good tutorial where I can learn using git+dropbox together effectively? ...
I'm trying to setup gitosis according to the instructions here. It works fine from my remote machine so the server seems to be setup fine but I'd also like to be able to do development on my gitosis server machine from a different user account (not the git user created in the gitosis setup). I've copied the key and modified the gitosis...
I'm working on releasing a PHP framework I have been using for a few years on github. Been trying to read up on the most correct way a project should be structured, what extra files such as readme's etc should be added. Been coming up with blanks on google. Can anyone point me to a project that's a good example or any good write ups. ...
So I was wondering - what's the point of the sign-off feature in git? When should I use it, should I use it, etc? I couldn't find any simple explanation, so it's your turn to provide one! ...
Consider the following scenario: Someone has a project on Github that might be updated once a month, and it has X functionality. I want to take that project and modify it slightly so it no longer functions like X but functions like Y, but I still want to stay up to date with their changes. How do I do this? I'm familiar with merging ...
What is TortoiseGit's equivalent to TortoiseSVN's "ignore patterns" ? Or otherwise, how do I make it ignore Resharper? ...
I use git for all of my projects and papers. Sometimes I'm away from my machines, but would like to work on something in a git repo. I've see gitweb which allows me to view files in a git repo that is sitting on my web server. Is there anything (cgi scripts or some such thing) that would allow me to point any browser at my web server ...
using git, I want to list all the different revisions of a given file. Then, I want to choose a particular version and compare it when another. How can I do this? ...
say I merged a branch to my master branch. Worked on it for a while, then realized some bug was introduced after the merge. How can I then see a list of files that were effected in the merge, and then one by one see a diff of them? ...
I have a Mercurial repository for a personal project, and I have been storing the master repository in my Dropbox for a few weeks now (something along this line; and I understand it's also possible with git). The idea is that it serves both as a way to work with multiple machines and as a remote backup. I clone the repository and work ...