Skip to Content

Changes for page Getting Started with Git

Last modified by Bastian Triller on 2013/05/21 17:24
From version 157.1
edited by Kieran Kelleher
on 2011/04/01 15:08
Change comment: There is no comment for this version
To version 153.1
edited by Kieran Kelleher
on 2011/03/21 18:46
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,35 +5,16 @@
1 -= Got Git? If not, Get Git here =
2 -
3 -[[OS X dmg Installer>>http://code.google.com/p/git-osx-installer/]]
4 -
5 5  = Learning About git =
6 6  
7 -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]]
6 +[[Linus Torvalds talks about git>>http://www.youtube.com/watch?v=4XpnKHJAok8]]
8 8  
9 -* [[Excellent Concept Tutorial on Git>>http://www.eecs.harvard.edu/~~cduan/technical/git/]]
8 += Install Git =
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!//
10 +[[OS X dmg Installer>>http://code.google.com/p/git-osx-installer/]]
13 13  
14 -* [[Linus Torvalds talks about git>>http://www.youtube.com/watch?v=4XpnKHJAok8]]
15 -
16 -Learn the basics here:
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/]]
20 -
21 -Get the Detailed Reference Materials Here:
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]]
25 -
26 26  = Git Goodies =
27 27  
28 -=== Git Bash Completion ===
29 -
30 -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:
31 -[[Git Bash Auto-Completion>>http://progit.org/book/ch2-7.html]]
32 -
33 33  === GitX git GUI ===
34 34  
35 35  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.
... ... @@ -71,7 +71,7 @@
71 71  * Switch to master branch before synchronizing with remote svn repo.
72 72  * 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.
73 73  
74 -{{code title="Mechanics of an svn update operation on a git-managed svn working copy"}}
55 +{{code title="Anatomony of an svn update operation on a git-managed svn working copy"}}
75 75  
76 76  
77 77  # Assume you are currently on a working branch. Verify this and check for uncommitted changes.
... ... @@ -113,20 +113,3 @@
113 113  git stash pop
114 114  
115 115  {{/code}}
116 -
117 -{{code title="Mechanics of an svn commit operation from a git-managed svn working copy"}}
118 -
119 -# First perform an svn update as outlined above in the previous section
120 -
121 -# Switch to the master branch
122 -git checkout master
123 -
124 -# Merge your working branch with the master
125 -git merge workingbranch
126 -
127 -# Use svn status, svn add and svn commit to commit your changes to the remote svn repository
128 -
129 -# Switch back to your workingbranch and get back to work.
130 -
131 -
132 -{{/code}}