Skip to Content

Changes for page Getting Started with Git

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

Summary

Details

Page properties
Content
... ... @@ -1,20 +1,35 @@
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 +
1 1  = Learning About git =
2 2  
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 +Start here:
7 7  
8 -= Install Git =
10 +* [[Excellent Concept Tutorial on Git>>http://www.eecs.harvard.edu/~~cduan/technical/git/]]
9 9  
10 -[[OS X dmg Installer>>http://code.google.com/p/git-osx-installer/]]
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!//
11 11  
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 +
12 12  = Git Goodies =
13 13  
14 14  === Git Bash Completion ===
15 15  
16 -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. Just google "git bash completion" or check out the tips here to set it up:
17 -[[Git Bash Completion>>http://superuser.com/questions/31744/how-to-get-git-completion-bash-to-work-on-mac-os-x]]
31 +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:
32 +[[Git Bash Auto-Completion>>http://progit.org/book/ch2-7.html]]
18 18  
19 19  === GitX git GUI ===
20 20  
... ... @@ -57,7 +57,7 @@
57 57  * Switch to master branch before synchronizing with remote svn repo.
58 58  * 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.
59 59  
60 -{{code title="Anatomony of an svn update operation on a git-managed svn working copy"}}
75 +{{code title="Mechanics of an svn update operation on a git-managed svn working copy"}}
61 61  
62 62  
63 63  # Assume you are currently on a working branch. Verify this and check for uncommitted changes.
... ... @@ -99,3 +99,20 @@
99 99  git stash pop
100 100  
101 101  {{/code}}
117 +
118 +{{code title="Mechanics of an svn commit operation from a git-managed svn working copy"}}
119 +
120 +# First perform an svn update as outlined above in the previous section
121 +
122 +# Switch to the master branch
123 +git checkout master
124 +
125 +# Merge your working branch with the master
126 +git merge workingbranch
127 +
128 +# Use svn status, svn add and svn commit to commit your changes to the remote svn repository
129 +
130 +# Switch back to your workingbranch and get back to work.
131 +
132 +
133 +{{/code}}