Skip to Content

Changes for page Getting Started with Git

Last modified by Bastian Triller on 2013/05/21 17:24
From version 68.1
edited by Kieran Kelleher
on 2012/01/03 10:02
Change comment: There is no comment for this version
To version 81.1
edited by Ray Kiddy
on 2011/08/13 21:41
Change comment: add correct help command

Summary

Details

Page properties
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.kieran
1 +XWiki.kiddyr
Content
... ... @@ -45,13 +45,10 @@
45 45  
46 46  = Use Git with a Subversion Project =
47 47  
48 -OK, so you want to use Git but you are working on a team project that is hosted in a subversion repository ... and it is making you depressed :-( . Well, you can still use Git to manage your local SVN working copy and be almost happy again (Either way, you won't be 100% happy unless the repository is a git one.)
48 +OK, so you want to use Git but you are working on a team project that is hosted in a subversion repository ... and it is making you depressed :-( . Well, you can still use Git to manage your local SVN working copy and be happy again
49 49  
50 -There are a couple ways of doing this. Two of them are:
50 +I recommend you just use the [[git+svn protocol>>http://www.lostechies.com/blogs/derickbailey/archive/2010/02/03/branch-per-feature-how-i-manage-subversion-with-git-branches.aspx]].
51 51  
52 -* Follow these [[Instructions>>http://www.lostechies.com/blogs/derickbailey/archive/2010/02/03/branch-per-feature-how-i-manage-subversion-with-git-branches.aspx]] to manually set up the integration.
53 -* Use [[SourceTree>>http://itunes.apple.com/us/app/sourcetree-git-hg/id411678673?mt=12]] which can clone your SVN repository locally as a full Git repository including all historical SVN commits and their metadata.
54 -
55 55  = Git Goodies for WebObjects Developers =
56 56  
57 57  This is a list of tools that other WebObjects developers have found to be helpful. It's not a comprehensive list, and if you find things not listed here please add them
... ... @@ -75,20 +75,11 @@
75 75  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:
76 76  [[Git Bash Auto-Completion>>http://progit.org/book/ch2-7.html]]
77 77  
78 -=== SourceTree by Atlassian ===
75 +=== GitX git GUI ===
79 79  
80 -SourceTree is a free Git/Mercurial GUI for OS X. A key feature is that it can use git-svn to "Clone" a SVN repository into a standard Git repository with your full SVN commit history and maintains a link back to the SVN repository. This allows you to easily use Git locally for development but still do your final commits to SVN.
77 +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.
78 +[[GitX Home Page>>http://gitx.frim.nl/]]
81 81  
82 -* [[SourceTree on AppStore>>http://itunes.apple.com/us/app/sourcetree-git-hg/id411678673?mt=12]]
83 -* [[SourceTree Home Page>>http://www.sourcetreeapp.com/]]
84 -
85 -=== GitX (L) git GUI ===
86 -
87 -While most (if not all) Git GUI apps will never be able to emulate all the intricate functionality of Git, one advantage of a GUI app is more convenient and faster browsing/visualization of history and inter-relationships of branches. While development on the original open source GitX.app has waned, this fork of the original has continued to mature into a nice Git client, and is useful for common every day Git operations. 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.
88 -[[GitX (L) Home Page>>http://gitx.laullon.com/]]
89 -
90 -Note this app replaces the original [[GitX>>http://gitx.frim.nl/]] by Pieter de Bie.
91 -
92 92  === Open in GitX ===
93 93  
94 94  [[Open In GitX Finder Droplet>>http://code.google.com/p/git-osx-installer/wiki/OpenInGitX]]
... ... @@ -148,7 +148,7 @@
148 148  
149 149  === Finding the List of All Git Commands ===
150 150  
151 -The "git help" command gives one the list of commonly used git commands. How does one find the others, since some of them turn out to be very useful? I tried "git help v". That was wrong. It would have been better to try "git help help", but this did tell me about the -all flag, which actually lists out all of the commands, and there are quite a few of them. So, good hunting.
139 +The "git help" command gives one the list of commonly used git commands. How does one find the others, since some of them turn out to be very useful. I tried "git help v". That was wrong. It would have been better to try "git help help", but this did tell me about the -all flag, which actually lists out all of the commands, and there are quite a few of them. So, good hunting.
152 152  
153 153  = Git Everyday Tasks =
154 154