Hi all, I'm using Git to manage my website's source code and deployment, and currently have the test and live sites running on the same box. Following this resource http://toroid.org/ams/git-website-howto originally, I came up with the following post-receive hook script to differentiate between pushes to my live site and pushes to my t...
I've been managing all of my todo-lists as ~/git-repo/todo which is kept under git. THen I add/delete files from the todo list, and have git autocommit all changes. However, I feel there should be more powerful tools. Besides "cil" and git-issues [neither of which I've tried], what tools are available? PS I want something that's ent...
Hi, So I'm looking to implement a wrapper for SVN in C#, I'm wondering what is the best way to interact with the SVN backend through the wrapper application. Any suggestions? The first thing that came through my head was directly using shell to manipulate SVN. Just wondering if there are alternative methods :) Thanks! ...
I've been searching around here for to look for an answer and it seems I may just be making incorrect assumptions on how git branches are supposed to work. I have my master branch and I've created a feature branch called profiles where I'm doing some specific work to profiles. While working on profiles I've changed 5 or 6 files and adde...
I would like to know what is the difference between versioning approaches suggested by git (or other DVCSs) and subversion (or other CVCSs). Here is what I found on http://www.xsteve.at/prg/vc_svn/svn.txt regarding this topic: Subversion mananges versioned trees as first order objects (the repository is an array of trees), and ...
I was assuming that both work in the same way. Both add every file onto index. But I seem wrong. What's the difference between git add . and git add -u? ...
How do I get git-svn to forget the svn authentication details ? We have a pairing machine running windows server 2008 on which we have a git repo and we check-in to a central subversion repository. I want git to prompt me for my subversion authentication details each time I check-in. I have removed the subversion files from under %APPD...
In SVN you can Check Out (to block others from working on the same file). Can you do this in GIT? It seems like you have to set up a second system that tells people what files are being edited by who with GIT? ...
I am having issue with git pull.I have commited my changes in local repo. When I do git status I do get a message saying "Your branch is ahead of 'origin/cherryPick' by 1 commit". When I try to pull from remote repository I get a message saying "Already up-to-date.".I think Iam missing some fundamental point.I have pasted the log below o...
I have a closed source project that is built on my open source framework. I want to know how I should structure my workflow. Below is my best guess using git with submodules. I create a public framework repo on github with submodules that are separate git repos. I purchase a "micro" account on github ($7) so I can have a private repo....
Along the same lines as this question - How do I clone all remote branches with Git?, if I have set up a Github repository like so: $ git clone [email protected]:viatropos/spree.git mycart $ cd mycart $ git branch * master $ git remote add origin [email protected]:viatropos/mycart.git fatal: remote origin already exists. $ git remote add myfo...
I'd like to delete a remote branch from my central git repository. The usual advice is to do 'git push origin :branchname' or 'git push origin :heads/branchname'. But when I try that, I get this error message: *** Deleting a branch is not allowed in this repository error: hooks/update exited with error code 1 error: hook declin...
Hello, My .gitignore file reads as follows: build/ glucosia.xcodeproj/ !glucosia.xcodeproj/project.pbxproj core-plot/framework/build core-plot/framework/CorePlot-CocoaTouch.xcodeproj/ !core-plot/framework/CorePlot-CocoaTouch.xcodeproj/project.pbxproj .DS_Store Classes/.DS_Store Strangely, glucosia.xcodeproj/project.pbxproj is not ign...
Note: I am not sure whether this has been already asked, as I can't find any question fitting to my context(or I am unable to understand the existing questions' contexts') I am loving Git these days. Especially, the topic branches. I am working on a small code sharing application. And I have got (local)branches like "master", "authentic...
We've been using GIT internally for quite some time now and have a pretty good work flow within our team. Yesterday we wanted to submit some bug fixes to a project on Github. That is something new to us. So this is what we did: Cloned their repo Forked the upstream Added our fork as a remote Fixed some bugs in the master branch Pushed ...
I realize that there are similar questions, but my question is slightly different. I'm wondering whether sharing a bare repository via a synchronized DropBox folder on multiple computers would work for sharing code via GIT. Really what I want to know is: is sharing a GIT repo via DropBox (the repo gets updated on each person's local dri...
How can I convert a 'normal' Git repository to a bare one? The main difference seems to be: in the normal git repository you have a .git folder inside the repository containing all relevant data and all other files build your working copy in a bar Git repository, there is no working copy and the folder (let's call it repo.git) contain...
So I have set up the following for my PHP project: A Git repository with all the code. An instance of Cruisecontrol with PhpUnderControl running on top of it. I created a new project in the cruisecontrol project directory and set up a poller to check changes on the git repo every 2 minutes. I have 2 projects running in this Cruisecon...
I've got a pair of git-svn branches which have been manually kept in sync by applying patches and what-not; git-merge has not been used. The branches are now in sync, which is to say that git diff A B has no output at all. [A] +----+--+--+--+--------+---+--------+-+---+-> \ / X / / \ \ X / / / \ X [B] --+-----+----...
I want to determine the associated SHA-1 of a submodule without cloning anything - i.e. remotely. git-ls-remote doesn't show this information, so my initial approach was to scrape the XHTML from gitweb and pull the SHA-1 out of there. Unfortunately, gitweb seems to have pretty poor support for submodules, showing 404 and 500 "unknown ob...