Git - Revision history

import>Jss43: /* git-svn links */

2008-08-09T15:10:26Z

git-svn links

@@ Line 35: / Line 35: @@
 * [http://www.flavio.castelli.name/howto_use_git_with_svn and another]
 * [http://www.dmo.ca/blog/20070608113513 Using svn branches]
 ==meld and git diff==

import>Jss43: /* Useful links */

2008-08-07T10:45:44Z

Useful links

← Older revision		Revision as of 10:45, 7 August 2008
Line 27:		Line 27:
	* [http://tomayko.com/writings/the-thing-about-git Funky commits and tangled workflows]		* [http://tomayko.com/writings/the-thing-about-git Funky commits and tangled workflows]
	* [http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/ you can always recover in git]		* [http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/ you can always recover in git]
			* [http://git.or.cz/gitwiki/FrontPage git wiki] is incredibly useful.

	==git-svn links==		==git-svn links==

import>Jss43: /* git paging */

2008-08-07T10:42:26Z

git paging

← Older revision		Revision as of 10:42, 7 August 2008
Line 54:		Line 54:
	The version of git on the 10.3 image (1.5.6) includes a controversial patch which enables the pager for the output of all commands, even when the output is less than a screen. I find this is incredibly annoying. This is being made into a configuration option, but for now we can work round it:		The version of git on the 10.3 image (1.5.6) includes a controversial patch which enables the pager for the output of all commands, even when the output is less than a screen. I find this is incredibly annoying. This is being made into a configuration option, but for now we can work round it:
	export GIT_PAGER='less -FX'		export GIT_PAGER='less -FX'
			or:
			git config --global core.pager 'less -FX'
	This will stop paging if the output is less than one screen. It has the disadvantage that long output (e.g. from ''git log'') is printed to screen (rather than existing only in the pager), but this is much like the behaviour of ''svn log'', so at least it's no worse. This can be overcome by using pipes if you really want to...		This will stop paging if the output is less than one screen. It has the disadvantage that long output (e.g. from ''git log'') is printed to screen (rather than existing only in the pager), but this is much like the behaviour of ''svn log'', so at least it's no worse. This can be overcome by using pipes if you really want to...

import>Jss43 at 10:38, 7 August 2008

2008-08-07T10:38:28Z

← Older revision		Revision as of 10:38, 7 August 2008
Line 1:		Line 1:
			== Overview ==

	git is the second project that Linus Torvalds has named after himself. It is now on the workstation image.		git is the second project that Linus Torvalds has named after himself. It is now on the workstation image.

Line 5:		Line 7:
	* Ability to use version control without the internet access required to access the wwmm server. I now have the complete history of our code on my laptop. No wifi needed! :-). It also means I can do sequential commits without needing internet access.		* Ability to use version control without the internet access required to access the wwmm server. I now have the complete history of our code on my laptop. No wifi needed! :-). It also means I can do sequential commits without needing internet access.
	* Branching and merging are easy and lightweight. This has changed how I work...		* Branching and merging are easy and lightweight. This has changed how I work...
	* git-svn provides an interface (in both directions) with a subversion repository. This means that we get all the advantages of using subversion (a centralised server which is backed up and ~~maintained~~ by someone other than us, subversion is installed on more systems, can work with people who are using subversion and don't want to change) with none of the disadvantages (subversion makes branches an absolute pain, especially if you want to just try something out and have a play without polluting the server). The interface is so slick, that I can use git and everyone else use subversion and not know that I'm using git (but I may have just let the cat out of the bag on that one).		* git-svn provides an interface (in both directions) with a subversion repository. This means that we get all the advantages of using subversion (a centralised server which is backed up and maintain Oed by someone other than us, subversion is installed on more systems, can work with people who are using subversion and don't want to change) with none of the disadvantages (subversion makes branches an absolute pain, especially if you want to just try something out and have a play without polluting the server). The interface is so slick, that I can use git and everyone else use subversion and not know that I'm using git (but I may have just let the cat out of the bag on that one).
	* It's fast.		* It's fast.
	* It doesn't screw around with my history or lose files.		* It doesn't screw around with my history or lose files.
Line 47:		Line 49:
	meld $2 $5		meld $2 $5
	and enjoy graphical diff wonderland.		and enjoy graphical diff wonderland.

			== git paging ==

			The version of git on the 10.3 image (1.5.6) includes a controversial patch which enables the pager for the output of all commands, even when the output is less than a screen. I find this is incredibly annoying. This is being made into a configuration option, but for now we can work round it:
			export GIT_PAGER='less -FX'
			This will stop paging if the output is less than one screen. It has the disadvantage that long output (e.g. from ''git log'') is printed to screen (rather than existing only in the pager), but this is much like the behaviour of ''svn log'', so at least it's no worse. This can be overcome by using pipes if you really want to...

	==Cool things==		==Cool things==

import>Ajwt3: /* Subversion migration using git */

2008-08-06T07:05:35Z

Subversion migration using git

@@ Line 116: / Line 116: @@
 athom@down:~/git/Cambridge [master]$ ls
 CamFile1 CamFile2 CamFile3 CamFile4
 </pre>

import>Ajwt3: /* Subversion migration using git */

2008-08-06T07:03:32Z

Subversion migration using git

← Older revision		Revision as of 07:03, 6 August 2008
Line 103:		Line 103:

	Plenty more to come...		Plenty more to come...

			Next we modify the Cambridge repository by adding file CamFile4 and move the changes to Berkeley

			<pre>
			athom@down:~/git/Berkeley [origin/HEAD]$ cd ../Cambridge/
			athom@down:~/git/Cambridge [master]$ ls
			CamFile1 CamFile2 CamFile3
			athom@down:~/git/Cambridge [master]$ git svn rebase
			First, rewinding head to replay your work on top of it...
			HEAD is now at 62b3628... A post-import file
			Fast-forwarded master to refs/remotes/git-svn.
			athom@down:~/git/Cambridge [master]$ ls
			CamFile1 CamFile2 CamFile3 CamFile4
			</pre>

	--[[User:ajwt3\|alex]] 07:21, 6 August 2008 (BST)		--[[User:ajwt3\|alex]] 07:21, 6 August 2008 (BST)

import>Ajwt3: /* Subversion migration using git */

2008-08-06T06:24:23Z

Subversion migration using git

← Older revision		Revision as of 06:24, 6 August 2008
Line 101:		Line 101:
	git-svn dcommit		git-svn dcommit
	</pre>		</pre>

			Plenty more to come...

	--[[User:ajwt3\|alex]] 07:21, 6 August 2008 (BST)		--[[User:ajwt3\|alex]] 07:21, 6 August 2008 (BST)

import>Ajwt3: Git useful information

2008-08-06T06:21:27Z

Git useful information

← Older revision		Revision as of 06:21, 6 August 2008
Line 78:		Line 78:
	</pre>		</pre>
	This is very useful (especially as git encourages branching so much!).		This is very useful (especially as git encourages branching so much!).

			== Subversion migration using git ==

			Thanks to http://linuxocarina.blogspot.com/2008/07/using-git-svn-migrate-svn-repository.html

			My project is to take an SVN repository Cambridge on server cam and SVN repository Berkeley on server berk and allow changes back and forth between the two.
			Cambridge is the initial repository, and we will create Berkeley from it (Berkeley is an initialized and blank SVN repository directory). Both Berekeley and Cambridge will be indepenedently
			modified, and the aim is to keep the two in sync via git.

			First, we must create the Berekeley respository from the Cambridge

			(Thanks to http://linuxocarina.blogspot.com/2008/07/using-git-svn-migrate-svn-repository.html)

			e.g. starting in /git :
			<pre>
			git-svn clone svn://cam/Cambridge Cambridge
			git clone file:///git/Cambridge Berkeley
			cd Berkeley
			git-svn init svn://berk/Berkeley
			git-svn fetch
			git rebase git-svn master
			git-svn dcommit
			</pre>

			--[[User:ajwt3\|alex]] 07:21, 6 August 2008 (BST)

import>Jss43 at 00:17, 1 August 2008

2008-08-01T00:17:20Z

← Older revision		Revision as of 00:17, 1 August 2008
Line 17:		Line 17:
	* branching and merging.		* branching and merging.
	* tab completion on the subcommands (e.g. git commit and svn commit) and a PS1 containing the branch information (see below).		* tab completion on the subcommands (e.g. git commit and svn commit) and a PS1 containing the branch information (see below).
	* git diff ~~works~~ with graphical diffs (svn is meant to, but good luck on getting it working with xxdiff).		* git diff plays nicely with graphical diffs (svn is meant to, but good luck on getting it working with xxdiff).

	==Useful links==		==Useful links==

import>Jss43: /* meld and git diff */

2008-08-01T00:16:48Z

meld and git diff

← Older revision		Revision as of 00:16, 1 August 2008
Line 35:		Line 35:
	==meld and git diff==		==meld and git diff==

	Set up git diff to use meld rather than outputting a unified diff by adding		Set up git diff to use meld or xxdiff rather than outputting a unified diff by adding, e.g.,
	[diff]		[diff]
	external = meld		external = meld
	to ~/.gitconfig.		to ~/.gitconfig.

	Unfortunately git tries to pass more information than meld can handle. Instead add:		Unfortunately git tries to pass more information than xxdiff or meld can handle. Instead add:
	[diff]		[diff]
	external = ~/bin/diff.sh		external = ~/bin/diff.sh
Line 46:		Line 46:
	#!/bin/bash		#!/bin/bash
	meld $2 $5		meld $2 $5
			and enjoy graphical diff wonderland.

	==Cool things==		==Cool things==