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 163.1
edited by Kieran Kelleher
on 2011/03/29 16:24
on 2011/03/29 16:24
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,5 +1,6 @@ 1 1 = Learning About git = 2 2 3 +[[Excellent Concept Tutorial on Git>>http://www.eecs.harvard.edu/~~cduan/technical/git/]] 3 3 [[Free Online Pro Git book>>http://progit.org/book/]] 4 4 [[Git User Manual>>http://www.kernel.org/pub/software/scm/git/docs/user-manual.html]] 5 5 [[Git Reference>>http://gitref.org/index.html]] ... ... @@ -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]]17 +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: 18 +[[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 108 +# Switch to the master branch 109 +git checkout master 107 107 111 +# Merge your working branch with the master 112 +git merge workingbranch 108 108 114 +# Use svn status, svn add and svn commit to commit your changes to the remote svn repository 115 + 116 +# Switch back to your workingbranch and get back to work. 117 + 118 + 109 109 {{/code}}