Skip to Content

Changes for page Getting Started with Git

Last modified by Bastian Triller on 2013/05/21 17:24
From version 200.1
edited by David Avendasora
on 2011/04/29 12:50
Change comment: There is no comment for this version
To version 192.1
edited by Pascal Robert
on 2011/04/29 14:53
Change comment: There is no comment for this version

Summary

Details

Page properties
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.avendasora
1 +XWiki.probert
Content
... ... @@ -1,41 +1,51 @@
1 1  = Got Git? No? Get Git =
2 2  
3 -* MacOS X: [[OS X dmg Installer>>http://code.google.com/p/git-osx-installer/]]
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/]]
4 4  
5 -= Learning About git =
8 += Learn About Git =
6 6  
7 -Start here:
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 8  
9 -* [[Excellent Concept Tutorial on Git>>http://www.eecs.harvard.edu/~~cduan/technical/git/]]
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 10  
11 -Have a Good Laugh here as Linus Torvalds Evangelizes git:
12 -//this is more fun than learning, but gives you insight into the motivation behind git//
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]]
13 13  
22 +* Git Cheat Sheets
23 +** [[http://cheat.errtheblog.com/s/git/]]
24 +** [[http://ktown.kde.org/%7Ezrusin/git/git-cheat-sheet-medium.png]]
25 +
14 14  * [[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.//
15 15  
16 -Learn the basics here:
29 += Get Started with Project Wonder =
17 17  
18 -* [[Everyday GIT With 20 Commands Or So>>http://www.kernel.org/pub/software/scm/git/docs/everyday.html]]
19 -* [[Free Online Pro Git book>>http://progit.org/book/]]
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
20 20  
21 -Get the Detailed Reference Materials Here:
33 +* [[Downloading Wonder>>http://wiki.objectstyle.org/confluence/display/WONDER/Getting+the+Wonder+Source+Code]] Wiki Page
22 22  
23 -* [[Git User Manual>>http://www.kernel.org/pub/software/scm/git/docs/user-manual.html]]
24 -* [[Git Reference>>http://gitref.org/index.html]]
35 += Use Git with a Subversion Project =
25 25  
26 -Git Cheat Sheets
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 27  
28 -* [[http://cheat.errtheblog.com/s/git/]]
29 -* [[http://ktown.kde.org/%7Ezrusin/git/git-cheat-sheet-medium.png]]
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]].
30 30  
31 -Checkout (Clone) Wonder Source Code
32 -
33 -* [[Instructions>>http://wiki.objectstyle.org/confluence/display/WONDER/Downloading%2C+Building%2C+Installing+and+Upgrading+Wonder+Source+Code]]
34 -
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
38 38  
45 +=== eGit ===
46 +
47 +Eclipse 3.6 have a Git plugin, eGit. It's not as good as Tower or GitX, but you can use it for most tasks (add, commit, push, pull). You can install by doing Install new Sofware -> select the "Helios" download site and find the eGit plugin in the list.
48 +
39 39  === Git Bash Completion ===
40 40  
41 41  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:
... ... @@ -50,22 +50,15 @@
50 50  
51 51  [[Open In GitX Finder Droplet>>http://code.google.com/p/git-osx-installer/wiki/OpenInGitX]]
52 52  
53 -== Git Tower ==
63 +=== Git Tower ===
54 54  
55 -For those of you who just get panic attacks at the thought of using the Terminal, there is a commercial app for that:
56 -[[Git Tower>>http://www.git-tower.com/]]
65 +[[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.
57 57  
58 58  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.
59 59   Miguel Arroz
60 60  
61 -== Using git locally on a Subversion Working Copy ==
70 += Unique Git Concepts =
62 62  
63 -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
64 -
65 -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]].
66 -
67 -== Git Concepts ==
68 -
69 69  === Rebasing ===
70 70  
71 71  Rebasing is unique to git. There is no counterpart in Subversion.
... ... @@ -76,11 +76,10 @@
76 76  
77 77  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.
78 78  
79 -* If you don't understand rebasing, don't use it
80 -* Use rebase on **private** branches
81 -* Use rebase for commits that have **not been pushed** to a remote repo
82 -
83 -[[http://progit.org/book/ch3-6.html]]
84 -[[http://www.eecs.harvard.edu/~~cduan/technical/git/git-5.shtml]]
85 -[[http://book.git-scm.com/4_rebasing.html]]
86 -[[http://blip.tv/file/4094727]]
82 +* If you don't understand rebasing, don't use it You can learn more about it here:
83 +** [[http://progit.org/book/ch3-6.html]]
84 +** [[http://www.eecs.harvard.edu/~~cduan/technical/git/git-5.shtml]]
85 +** [[http://book.git-scm.com/4_rebasing.html]]
86 +** [[http://blip.tv/file/4094727]]
87 +* Use rebase only on **private** branches
88 +* Use rebase only for commits that have **not been pushed** to a remote repo