Skip to Content

Changes for page Getting Started with Git

Last modified by Bastian Triller on 2013/05/21 17:24
From version 36.1
edited by Kieran Kelleher
on 2011/04/06 19:17
Change comment: There is no comment for this version
To version 99.1
edited by Kieran Kelleher
on 2011/03/21 18:44
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,41 +6,15 @@
1 -= Got Git? If not, Get Git here =
2 -
3 -Just pick the latest release for your Mac architecture here:
4 -[[OS X dmg Installer>>http://code.google.com/p/git-osx-installer/]]
5 -
6 6  = Learning About git =
7 7  
8 -Start here:
3 +[[Free Online Pro Git book>>http://progit.org/book/]]
4 +[[Git User Manual>>http://www.kernel.org/pub/software/scm/git/docs/user-manual.html]]
5 +[[Git Reference>>http://gitref.org/index.html]]
9 9  
10 -* [[Excellent Concept Tutorial on Git>>http://www.eecs.harvard.edu/~~cduan/technical/git/]]
7 += Install Git =
11 11  
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!//
9 +[[OS X dmg Installer>>http://code.google.com/p/git-osx-installer/]]
14 14  
15 -* [[Linus Torvalds talks about git>>http://www.youtube.com/watch?v=4XpnKHJAok8]]
16 -
17 -Learn the basics here:
18 -
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/]]
21 -
22 -Get the Detailed Reference Materials Here:
23 -
24 -* [[Git User Manual>>http://www.kernel.org/pub/software/scm/git/docs/user-manual.html]]
25 -* [[Git Reference>>http://gitref.org/index.html]]
26 -
27 -Git Cheat Sheets
28 -
29 -* [[http://cheat.errtheblog.com/s/git/]]
30 -* [[http://ktown.kde.org/%7Ezrusin/git/git-cheat-sheet-medium.png]]
31 -
32 32  = Git Goodies =
33 33  
34 -=== Git Bash Completion ===
35 -
36 -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:
37 -[[Git Bash Auto-Completion>>http://progit.org/book/ch2-7.html]]
38 -
39 39  === GitX git GUI ===
40 40  
41 41  GitX is an awesome FREE history viewer made for OS X. It is a better way to visualize your branch and commit history of your git repository. However, power users (aka "cool kids") will probably only use it for history viewing while they continue to use the terminal command line for checkouts, branching, staging, rebasing and committing.
... ... @@ -50,9 +50,6 @@
50 50  For those of you who just get panic attacks at the thought of using the Terminal, there is a commercial app for that:
51 51  [[Git Tower>>http://www.git-tower.com/]]
52 52  
53 -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.
54 -- Miguel Arroz
55 -
56 56  = Using git locally on a Subversion Working Copy =
57 57  
58 58  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!
... ... @@ -80,7 +80,7 @@
80 80  * Switch to master branch before synchronizing with remote svn repo.
81 81  * You can use ##git stash## to temporarily put aside your uncommitted changes before doing an svn update. Then use ##git stash pop## to replay those uncommitted changes onto the working copy.
82 82  
83 -{{code title="Mechanics of an svn update operation on a git-managed svn working copy"}}
54 +{{code title="Anatomony of an svn update operation on a git-managed svn working copy"}}
84 84  
85 85  
86 86  # Assume you are currently on a working branch. Verify this and check for uncommitted changes.
... ... @@ -122,20 +122,3 @@
122 122  git stash pop
123 123  
124 124  {{/code}}
125 -
126 -{{code title="Mechanics of an svn commit operation from a git-managed svn working copy"}}
127 -
128 -# First perform an svn update as outlined above in the previous section
129 -
130 -# Switch to the master branch
131 -git checkout master
132 -
133 -# Merge your working branch with the master
134 -git merge workingbranch
135 -
136 -# Use svn status, svn add and svn commit to commit your changes to the remote svn repository
137 -
138 -# Switch back to your workingbranch and get back to work.
139 -
140 -
141 -{{/code}}