Changes for page Getting Started with Git
Last modified by Bastian Triller on 2013/05/21 17:24
From version 139.1
edited by Kieran Kelleher
on 2011/03/22 01:36
on 2011/03/22 01:36
Change comment:
There is no comment for this version
To version 167.1
edited by Kieran Kelleher
on 2011/04/01 15:01
on 2011/04/01 15:01
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,10 +1,23 @@ 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]] 3 +Start here: 7 7 5 +* [[Excellent Concept Tutorial on Git>>http://www.eecs.harvard.edu/~~cduan/technical/git/]] 6 + 7 +Have a Good Laugh here as Linus Torvalds Evangelizes git: 8 + 9 +* [[Linus Torvalds talks about git>>http://www.youtube.com/watch?v=4XpnKHJAok8]] 10 + 11 +Learn the basics here: 12 + 13 +* [[Everyday GIT With 20 Commands Or So>>http://www.kernel.org/pub/software/scm/git/docs/everyday.html]] 14 +* [[Free Online Pro Git book>>http://progit.org/book/]] 15 + 16 +Get the Detailed Reference Materials Here: 17 + 18 +* [[Git User Manual>>http://www.kernel.org/pub/software/scm/git/docs/user-manual.html]] 19 +* [[Git Reference>>http://gitref.org/index.html]] 20 + 8 8 = Install Git = 9 9 10 10 [[OS X dmg Installer>>http://code.google.com/p/git-osx-installer/]] ... ... @@ -13,8 +13,8 @@ 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"gitbashcompletion"or checkoutthe tipshere 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]]29 +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: 30 +[[Git Bash Auto-Completion>>http://progit.org/book/ch2-7.html]] 18 18 19 19 === GitX git GUI === 20 20 ... ... @@ -104,6 +104,15 @@ 104 104 105 105 # First perform an svn update as outlined above in the previous section 106 106 120 +# Switch to the master branch 121 +git checkout master 107 107 123 +# Merge your working branch with the master 124 +git merge workingbranch 108 108 126 +# Use svn status, svn add and svn commit to commit your changes to the remote svn repository 127 + 128 +# Switch back to your workingbranch and get back to work. 129 + 130 + 109 109 {{/code}}