Skip to Content

Changes for page Getting Started with Git

Last modified by Bastian Triller on 2013/05/21 17:24
From version 193.1
edited by Pascal Robert
on 2011/04/29 14:53
Change comment: There is no comment for this version
To version 194.1
edited by Kieran Kelleher
on 2011/04/29 12:14
Change comment: There is no comment for this version

Summary

Details

Page properties
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.probert
1 +XWiki.kieran
Content
... ... @@ -1,51 +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>>http://wiki.objectstyle.org/confluence/display/WONDER/Downloading%2C+Building%2C+Installing+and+Upgrading+Wonder+Source+Code]]
44 44  
45 -=== eGit ===
36 += Git Goodies =
46 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 -
49 49  === Git Bash Completion ===
50 50  
51 51  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:
... ... @@ -60,15 +60,22 @@
60 60  
61 61  [[Open In GitX Finder Droplet>>http://code.google.com/p/git-osx-installer/wiki/OpenInGitX]]
62 62  
63 -=== Git Tower ===
52 +== Git Tower ==
64 64  
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.
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/]]
66 66  
67 67  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.
68 68   Miguel Arroz
69 69  
70 -= Unique Git Concepts =
60 +== Using git locally on a Subversion Working Copy ==
71 71  
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
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 +== Git Concepts ==
67 +
72 72  === Rebasing ===
73 73  
74 74  Rebasing is unique to git. There is no counterpart in Subversion.
... ... @@ -79,10 +79,11 @@
79 79  
80 80  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.
81 81  
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
78 +* If you don't understand rebasing, don't use it!
79 +* Use rebase on **private** branches
80 +* Use rebase for commits that have **not been pushed** to a remote repo
81 +
82 +[[http://progit.org/book/ch3-6.html]]
83 +[[http://www.eecs.harvard.edu/~~cduan/technical/git/git-5.shtml]]
84 +[[http://book.git-scm.com/4_rebasing.html]]
85 +[[http://blip.tv/file/4094727]]