Skip to Content

Changes for page Getting Started with Git

Last modified by Bastian Triller on 2013/05/21 17:24
From version 199.1
edited by David Avendasora
on 2011/04/29 13:28
Change comment: There is no comment for this version
To version 190.1
edited by David Avendasora
on 2011/04/29 13:34
Change comment: Formatting, wording, added some links.

Summary

Details

Page properties
Content
... ... @@ -5,12 +5,12 @@
5 5  ** MacOS X [[.dmg Binary Installers>>http://code.google.com/p/git-osx-installer/]]
6 6  ** Microsoft Windows [[.exe Binary Installers>>http://code.google.com/p/msysgit/]]
7 7  
8 -= Learning About git =
8 += Learn About Git =
9 9  
10 10  * Learn the concepts.
11 11  ** [[This>>http://www.eecs.harvard.edu/~~cduan/technical/git/]] is an excellent tutorial on the basic concepts behind Git
12 12  
13 -* Now get the basics.
13 +* Learn the basics.
14 14  ** [[Everyday GIT With 20 Commands Or So>>http://www.kernel.org/pub/software/scm/git/docs/everyday.html]]
15 15  ** [[Free Online Pro Git book>>http://progit.org/book/]]
16 16  
... ... @@ -32,6 +32,12 @@
32 32  
33 33  * [[Downloading Wonder>>http://wiki.objectstyle.org/confluence/display/WONDER/Getting+the+Wonder+Source+Code]] Wiki Page
34 34  
35 += Use Git with a Subversion Project =
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
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]].
40 +
35 35  = Git Goodies for WebObjects Developers =
36 36  
37 37  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
... ... @@ -57,16 +57,10 @@
57 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 58   Miguel Arroz
59 59  
60 -== Using git locally on a Subversion Working Copy ==
66 += Unique Git Concepts =
61 61  
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
68 +=== Rebasing ===
63 63  
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]].
65 -
66 -== Unique Git Concepts ==
67 -
68 -===== Rebasing =====
69 -
70 70  Rebasing is unique to git. There is no counterpart in Subversion.
71 71  
72 72  Rebasing cuts down on the spaghetti history of merging and helps to keep history nice and linear.