Using git with cgit for decentralized/centralized development

Posted by polemon on Super User See other posts from Super User or by polemon
Published on 2011-03-19T13:39:02Z Indexed on 2011/03/19 16:12 UTC
Read the original article Hit count: 196

Filed under:

git

|

git-daemon

|

cgit

I plan to use git for hosting my projects on my server.

I've read about cgit, git-daemon, and I more or less decided to use those tools. But general use is still kind of confusing for me.

What do I need to set up on the server, to push my files onto it. And when the files on the server are newer as the files on my computer, how do I merge them?

Also, I use, say, two computers where I develop. How do I merge from one computer to the other?

Also, when two people are working on the same project, how do they merge their local repos from one another?

As you probably can tell by now, I come from SVN, but I've worked with Mercurial and now I'd like to test git.

© Super User or respective owner

Related posts about git

git pull gives error: 401 Authorization Required while accessing https://git.foo.com/bar.git

as seen on Stack Overflow - Search for 'Stack Overflow'
My macbook pro is able to clone/push/pull from the company git server. My cent 6.3 vm gets a 401 error git clone https://git.acme.com/git/torque-setup "error: The requested URL returned error: 401 Authorization Required while accessing https://git.acme.com/git/torque-setup/info/refs As a work… >>> More
Can't install git on Ubuntu 12.10

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
I'm following these instructions to install git on my laptop: http://git-scm.com/download/linux When I do: $ sudo apt-get install git-core This is what my terinal shows: Reading package lists... Done Building dependency tree Reading state information... Done The following packages… >>> More
Git apache : unable to push via http

as seen on Server Fault - Search for 'Server Fault'
I have to setup a server which can allow http vcs management (such as git and svn). svn support works well, but I have some trouble with git. Actual configuration: CentOS 5 Apache 2.2.8 Git 1.7.4.1 The /etc/httpd/conf/httpd.conf content: ServerTokens OS ServerRoot "/etc/httpd" PidFile run/httpd… >>> More
git on HTTP with gitolite and nginx

as seen on Server Fault - Search for 'Server Fault'
I am trying to setup a server where my git repo would be accessible with HTTP(S). I am using gitolite and nginx (and gitlab for web interface but I doubt it makes any difference). I have searched the whole afternoon and I think I'm stuck. I have think I have understood that nginx needs fcgiwrap… >>> More
Redmine git integration - issue in accessing git from redmine but not from external git client

as seen on Server Fault - Search for 'Server Fault'
I have setup redmine integration with apache as described in the redmine documentation. I have a /git path accessible with auth and /git-private accessible only to redmine. When I clone the repository through /git path, I get the up-to-date repo. But when I try to view it in redmine repo viewer, I… >>> More

Related posts about git-daemon

Git Daemon on linux?

as seen on Server Fault - Search for 'Server Fault'
Trying to set up a simple git-daemon on a linux server, and talk to it from a windows box. On linux server: Make a folder /home/foo/bar CD to /home/foo/bar do a git --bare init here Do a touch git-daemon-export-ok CD to /home/foo Run the command git-daemon --verbose --reuseaddr --base-path=/home/foo… >>> More
Git Daemon on linux?

as seen on Server Fault - Search for 'Server Fault'
Trying to set up a simple git-daemon on a linux server, and talk to it from a windows box. On linux server: Make a folder /home/foo/bar CD to /home/foo/bar do a git --bare init here Do a touch git-daemon-export-ok CD to /home/foo Run the command git-daemon --verbose --reuseaddr --base-path=/home/foo… >>> More
git-daemon fails on VM suspend and resume

as seen on Super User - Search for 'Super User'
I have Gitorious running on a Centos 5.3 install on a VMWare virtual machine under VMWare Server. Everytime we take down the server via suspend to back up the image, and resume the VM, the git-daemon dies. All my other processes continue to function without any problems, this one process dies and… >>> More
git daemon fails to show appeared repository

as seen on Stack Overflow - Search for 'Stack Overflow'
I set up .git in a directory on my local machine. I then run: mkdir a cd a git init git daemon : then I create another directory b: mkdir b cd b git clone git://127.0.0.1 : and I get the following error: Initialized empty Git repository in /b/127.0.0.1/.git/ fatal: The remote end hung up unexpectedly :… >>> More
how do I start GIT daemon automatically under CentOS 4.8 ?

as seen on Super User - Search for 'Super User'
Apparently my server is running CentOS 4.8 with Cpanel uname -a 2.6.9-023stab048.6-enterprise #1 SMP MSK 2008 i686 i686 i386 GNU/Linux cat /etc/redhat-release CentOS release 4.8 (Final) I'd prefer to install it as a service but I cannot seem to install "yum git-daemon" there is no package available… >>> More