Version Control

Most useful reference thus far: http://linux.yyz.us/git-howto.html

Good stuff on branching / merging and the rest of what makes GIT a bit confusing to newbs: http://lwn.net/Articles/210045/

Linus' top tips (very helpful!): http://www.kernel.org/pub/software/scm/git/docs/everyday.html

An introduction to git-svn for deserters

http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#how-to-get-a-git-repository

Use GIT to talk to SVN repositories with the “git-svn” command.

(Lifted from http://www.gnome.org/~federico/misc/git-cheat-sheet.txt)

+ Subversion:

		* http://duncan.mac-vicar.com/blog/archives/255

		+ Get a whole SVN repo:

			git-svn clone svn+ssh://user@svn.gnome.org/svn/project/trunk

		+ Now you can "git commit" locally, examine history, etc.

		+ If you do a merge from a local branch, do it like

			git checkout master
			git merge --squash my-work-branch

			See this for info:

			http://lists-archives.org/git/595205-git-svn-error-unable-to-extract-revision-information-from-commit-1.html

		+ Finally Commit your changes to SVN upstream:

			git-svn dcommit

		+ Update from SVN periodially:

			git-svn rebase

Well, I've not left SVN behind completely.

# Check out a project, but only sub-dirs A B and C, out of potentially thousands of sub-dirs
svn co -N http://url-of-repo/project
svn up A B C