Skip to Content

Changes for page Getting Started with Git

Last modified by Bastian Triller on 2013/05/21 17:24
From version 181.1
edited by David Avendasora
on 2011/04/29 15:44
Change comment: There is no comment for this version
To version 198.1
edited by David Avendasora
on 2011/04/29 13:28
Change comment: There is no comment for this version

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 -= Learn About Git =
8 += Learning 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 -* Learn the basics.
13 +* Now get 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  
... ... @@ -26,36 +26,16 @@
26 26  * [[Linus Torvalds talks about git>>http://www.youtube.com/watch?v=4XpnKHJAok8]]
27 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 =
29 += Get Started with Project Wonder! =
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
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!
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 -
41 41  = Git Goodies for WebObjects Developers =
42 42  
43 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
44 44  
45 -=== EGit ===
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:
... ... @@ -77,10 +77,16 @@
77 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 78   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  
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 +
84 84  Rebasing is unique to git. There is no counterpart in Subversion.
85 85  
86 86  Rebasing cuts down on the spaghetti history of merging and helps to keep history nice and linear.