Skip to Content

Changes for page Getting Started with Git

Last modified by Bastian Triller on 2013/05/21 17:24
From version 77.1
edited by David Avendasora
on 2011/11/02 22:53
Change comment: There is no comment for this version
To version 68.1
edited by Kieran Kelleher
on 2012/01/03 10:02
Change comment: There is no comment for this version

Summary

Details

Page properties
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.avendasora
1 +XWiki.kieran
Content
... ... @@ -47,8 +47,11 @@
47 47  
48 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.)
49 49  
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]].
50 +There are a couple ways of doing this. Two of them are:
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 +
52 52  = Git Goodies for WebObjects Developers =
53 53  
54 54  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,14 +75,17 @@
75 75  === SourceTree by Atlassian ===
76 76  
77 77  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.
78 -**[[SourceTree on AppStore>>http://itunes.apple.com/us/app/sourcetree-git-hg/id411678673?mt=12]]
79 -**[[SourceTree Home Page>>http://www.sourcetreeapp.com/]]
80 80  
81 -=== GitX git GUI ===
82 +* [[SourceTree on AppStore>>http://itunes.apple.com/us/app/sourcetree-git-hg/id411678673?mt=12]]
83 +* [[SourceTree Home Page>>http://www.sourcetreeapp.com/]]
82 82  
83 -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.
84 -[[GitX Home Page>>http://gitx.frim.nl/]]
85 +=== GitX (L) git GUI ===
85 85  
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 +
86 86  === Open in GitX ===
87 87  
88 88  [[Open In GitX Finder Droplet>>http://code.google.com/p/git-osx-installer/wiki/OpenInGitX]]