Changes for page Getting Started with Git

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -1,61 +1,40 @@
1		-= Got Git? No? Get Git =
	1	+= Got Git? If not, Get Git here =
2	2
3		-* Official Download Site: [[http://git-scm.com/download]]
4		-* Direct Download Links:
5		-** MacOS X [[.dmg Binary Installers>>http://code.google.com/p/git-osx-installer/]]
6		-** Microsoft Windows [[.exe Binary Installers>>http://code.google.com/p/msysgit/]]
	3	+Just pick the latest release for your Mac architecture here:
	4	+[[OS X dmg Installer>>http://code.google.com/p/git-osx-installer/]]
7	7
8		-= Learn About Git =
	6	+= Learning About git =
9	9
10		-* Learn the concepts.
11		-** [[This>>http://www.eecs.harvard.edu/~~cduan/technical/git/]] is an excellent tutorial on the basic concepts behind Git
	8	+Start here:
12	12
13		-* Learn the basics.
14		-** [[Everyday GIT With 20 Commands Or So>>http://www.kernel.org/pub/software/scm/git/docs/everyday.html]]
15		-** [[Free Online Pro Git book>>http://progit.org/book/]]
	10	+* [[Excellent Concept Tutorial on Git>>http://www.eecs.harvard.edu/~~cduan/technical/git/]]
16	16
17		-* Get familiar with the reference materials available online
18		-** Official [[Git Documentation>>http://git-scm.com/documentation]] Site
19		-** Official [[Git User Manual>>http://www.kernel.org/pub/software/scm/git/docs/user-manual.html]]
20		-** [[Git Reference>>http://gitref.org/index.html]]
	12	+Have a Good Laugh here as Linus Torvalds Evangelizes git:
	13	+//this is more fun than learning, but gives you insight into the motivation behind git!//
21	21
22		-* Git Cheat Sheets
23		-** [[http://cheat.errtheblog.com/s/git/]]
24		-** [[http://ktown.kde.org/%7Ezrusin/git/git-cheat-sheet-medium.png]]
25		-
26	26	* [[Linus Torvalds talks about git>>http://www.youtube.com/watch?v=4XpnKHJAok8]]
27		-Have a Good Laugh here as Linus Torvalds Evangelizes git. //NOTE: This isn't really learning, but it is way more fun and gives you insight into the motivation behind git.//
28	28
29		-= Get Started with Project Wonder =
	17	+Learn the basics here:
30	30
31		-The best way to learn a new concept is to actually use it, and what better way than to do something practical like clone (checkout) the Project Wonder source code
	19	+* [[Everyday GIT With 20 Commands Or So>>http://www.kernel.org/pub/software/scm/git/docs/everyday.html]]
	20	+* [[Free Online Pro Git book>>http://progit.org/book/]]
32	32
33		-* [[Downloading Wonder>>http://wiki.objectstyle.org/confluence/display/WONDER/Getting+the+Wonder+Source+Code]] Wiki Page
	22	+Get the Detailed Reference Materials Here:
34	34
35		-= Use Git with a Subversion Project =
	24	+* [[Git User Manual>>http://www.kernel.org/pub/software/scm/git/docs/user-manual.html]]
	25	+* [[Git Reference>>http://gitref.org/index.html]]
36	36
37		-OK, so you want to use Git but you are working on a team project that is hosted in a subversion repository ... and it is making you depressed :-( . Well, you can still use Git to manage your local SVN working copy and be happy again
	27	+Git Cheat Sheets
38	38
39		-I recommend you just use the [[git+svn protocol>>http://www.lostechies.com/blogs/derickbailey/archive/2010/02/03/branch-per-feature-how-i-manage-subversion-with-git-branches.aspx]].
	29	+* [[http://cheat.errtheblog.com/s/git/]]
	30	+* [[http://ktown.kde.org/%7Ezrusin/git/git-cheat-sheet-medium.png]]
40	40
41		-= Git Goodies for WebObjects Developers =
	32	+Checkout (Clone) Wonder Source Code, Build and Install
42	42
43		-This is a list of tools that other WebObjects developers have found to be helpful. It's not a comprehensive list, and if you find things not listed here please add them
	34	+* [[Instructions>>WOCOM:20110325Project Wonder is now on Github!]]
44	44
45		-=== EGit ===
	36	+= Git Goodies =
46	46
47		-EGit is a plugin for Eclipse 3.6. It's not as good as Tower or GitX, but you can use it for most tasks (add, commit, push, pull).
48		-
49		-* [[EGit/Git For Eclipse Users>>http://wiki.eclipse.org/EGit/Git_For_Eclipse_Users]]
50		-* [[User Guide>>http://wiki.eclipse.org/EGit/User_Guide]]
51		-* Installation
52		-*1. In Eclipse, select //Help > Install New Sofware...//
53		-*1. Select the "Helios" download site from the Work with: combo box
54		-*1. Expand the "Collaboration" group
55		-*1. Select the EGit plugin, click Next
56		-*1. Complete the install process and agree to the license, etc.
57		-*1. Restart Eclipse.
58		-
59	59	=== Git Bash Completion ===
60	60
61	61	This is really an absolute necessity and a **huge** productivity improvement. Basically you need the bash completion script from the source tarball and use your shell profile to include it whenever you open a shell. See the **Auto-Completion** section on this page:
...	...	@@ -70,29 +70,16 @@
70	70
71	71	[[Open In GitX Finder Droplet>>http://code.google.com/p/git-osx-installer/wiki/OpenInGitX]]
72	72
73		-=== Git Tower ===
	52	+== Git Tower ==
74	74
75		-[[Git Tower>>http://www.git-tower.com/]] is a commerical app for those of you who just get panic attacks at the thought of using the Terminal.
	54	+For those of you who just get panic attacks at the thought of using the Terminal, there is a commercial app for that:
	55	+[[Git Tower>>http://www.git-tower.com/]]
76	76
77		-I use Tower (bought it), but only for committing and fixing merge conflicts. I think Tower misses quite a bit of the flagship feature of GIT: branches. You can't see a branch tree graphically, like you can with gitX or even the command line (git log -graph -color, IIRC). But it's cool for committing. For everything else I use command line.
78		- Miguel Arroz
	57	+I use Tower (bought it), but only for committing and fixing merge conflicts. I think Tower misses quite a bit of the flagship feature of GIT: branches. You can't see a branch tree graphically, like you can with gitX or even the command line (git log ---graph ---color, IIRC). But it's cool for committing. For everything else I use command line.
	58	+- Miguel Arroz
79	79
80		-= Unique Git Concepts =
	60	+= Using git locally on a Subversion Working Copy =
81	81
82		-=== Rebasing ===
	62	+OK, so you are addicted to git, and now you have to work on a team project that is hosted in a remote subversion repository ... and it is making you depressed :-(. Well, you can use manage your local svn working copy using git and be happy again!
83	83
84		-Rebasing is unique to git. There is no counterpart in Subversion.
85		-
86		-Rebasing cuts down on the spaghetti history of merging and helps to keep history nice and linear.
87		-
88		-Conceptually, when I rebase my current branch A on another branch B, git removes all my branch A commits back to the common ancestor of A and B, stashes those commits away temporarily, moves the head of the current branch A to the tip of the other branch B, and then re-applys all my stashed commits as **new commit** patches to my branch B.
89		-
90		-However before using it on work that is shared with others you MUST follow the these rules, otherwise you will screw everyone else on the project.
91		-
92		-* If you don't understand rebasing, don't use it You can learn more about it here:
93		-** [[http://progit.org/book/ch3-6.html]]
94		-** [[http://www.eecs.harvard.edu/~~cduan/technical/git/git-5.shtml]]
95		-** [[http://book.git-scm.com/4_rebasing.html]]
96		-** [[http://blip.tv/file/4094727]]
97		-* Use rebase only on **private** branches
98		-* Use rebase only for commits that have **not been pushed** to a remote repo
	64	+I recommend you just use the [[git+svn protocol>>http://www.lostechies.com/blogs/derickbailey/archive/2010/02/03/branch-per-feature-how-i-manage-subversion-with-git-branches.aspx]].