Git

From LiftWiki

The lift's team currently evaluate migrating from Subversion (svn) to Git. I create this page to abstract links and useful info

• the original discussion
• Doc
  • "official" documentation (man, tutorials, guide)
  • A tutorial introduction to git
  • Git Magic - Explains Git in terms of saving progress in video games
  • some Guides for GitHub
  • Git SVN Workflow, how to keep sync SVN with a Git repository
  • Git GitHub for Windows' user
• Tools
  • GitHub the public central repository where lift code is hosted
  • Git Plugin for Eclipse
  • msysGit a Git exe for windows
  • QGit - A GUI front-end for viewing a git repository (requries either Qt3 or Qt4, depending on version).

Managing Forks

I forked http://github.com/dpp/lift/tree/master to http://github.com/tjweir/lift/tree/master and I want to keep in sync with the updates to dpp/lift. This is how I do it.

In my repo add a remote reference to dpp/lift:
$ git remote add dppmaster git://github.com/dpp/lift.git

Fetch
$ git fetch dppmaster

This will create a branch, so then you just have to merge back:
$ git checkout master
$ git merge dppmaster/master

Commit those new changes:
$ git commit -a -m "Sync to fork master"

Using git as a newcomer (Eric - 20/06/2008)

This page is a small description of my use of git as a newcomer and the kind of issues I had:

Eric_Using_Git