Skip to Content

Changes for page Getting Started with Git

Last modified by Bastian Triller on 2013/05/21 17:24
From version 154.1
edited by Kieran Kelleher
on 2011/03/21 18:46
Change comment: There is no comment for this version
To version 155.1
edited by Kieran Kelleher
on 2011/03/22 14:37
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -11,6 +11,11 @@
11 11  
12 12  = Git Goodies =
13 13  
14 +=== Git Bash Completion ===
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. See the **Auto-Completion** section on this page:
17 +[[Git Bash Auto-Completion>>http://progit.org/book/ch2-7.html]]
18 +
14 14  === GitX git GUI ===
15 15  
16 16  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.
... ... @@ -52,7 +52,7 @@
52 52  * Switch to master branch before synchronizing with remote svn repo.
53 53  * 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.
54 54  
55 -{{code title="Anatomony of an svn update operation on a git-managed svn working copy"}}
60 +{{code title="Mechanics of an svn update operation on a git-managed svn working copy"}}
56 56  
57 57  
58 58  # Assume you are currently on a working branch. Verify this and check for uncommitted changes.
... ... @@ -94,3 +94,20 @@
94 94  git stash pop
95 95  
96 96  {{/code}}
102 +
103 +{{code title="Mechanics of an svn commit operation from a git-managed svn working copy"}}
104 +
105 +# First perform an svn update as outlined above in the previous section
106 +
107 +# Switch to the master branch
108 +git checkout master
109 +
110 +# Merge your working branch with the master
111 +git merge workingbranch
112 +
113 +# Use svn status, svn add and svn commit to commit your changes to the remote svn repository
114 +
115 +# Switch back to your workingbranch and get back to work.
116 +
117 +
118 +{{/code}}