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 164.1
edited by Kieran Kelleher
on 2011/03/29 16:24
Change comment: There is no comment for this version

Summary

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 "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]]
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  
... ... @@ -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"}}
61 +{{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}}
103 +
104 +{{code title="Mechanics of an svn commit operation from a git-managed svn working copy"}}
105 +
106 +# First perform an svn update as outlined above in the previous section
107 +
108 +# Switch to the master branch
109 +git checkout master
110 +
111 +# Merge your working branch with the master
112 +git merge workingbranch
113 +
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 +
119 +{{/code}}