Revision 11974
Added by Aaron Marcuse-Kubitza almost 11 years ago
index.htm | ||
---|---|---|
2111 | 2111 |
</DL><p> |
2112 | 2112 |
<DT><a name="git" href="#git"><H3 ADD_DATE="1365937546">git</H3></a> |
2113 | 2113 |
<DL><p> |
2114 |
<DT><A HREF="https://git.wiki.kernel.org/index.php/GitSvnCrashCourse" name="https://git.wiki.kernel.org/index.php/GitSvnCrashCourse" ADD_DATE="1389298877" ICON_URI="https://git.wiki.kernel.org/favicon.ico" LAST_CHARSET="UTF-8"><img width="16" height="16" src="https://git.wiki.kernel.org/favicon.ico" style="margin-right: 0.5em;"/>*** GitSvnCrashCourse - Git SCM Wiki</A><a name="*** GitSvnCrashCourse - Git SCM Wiki" href="#*** GitSvnCrashCourse - Git SCM Wiki" style="margin-left: 0.5em;">¶</a> |
|
2114 |
<DT><A HREF="http://viget.com/extend/a-gaggle-of-git-tips" name="http://viget.com/extend/a-gaggle-of-git-tips" ADD_DATE="1365937554" ICON_URI="http://viget.com/favicon.ico" LAST_CHARSET="UTF-8"><img width="16" height="16" src="http://viget.com/favicon.ico" style="margin-right: 0.5em;"/>A Gaggle Of Git Tips | Viget</A><a name="A Gaggle Of Git Tips | Viget" href="#A Gaggle Of Git Tips | Viget" style="margin-left: 0.5em;">¶</a> |
|
2115 |
<DD>"I use git rebase -i to make sure every commit is clean. For example, when I have two commits with broken code followed by a third clean commit" |
|
2116 |
<DT><A HREF="http://viget.com/extend/effectively-using-git-with-subversion" name="http://viget.com/extend/effectively-using-git-with-subversion" ADD_DATE="1365937443" ICON_URI="http://viget.com/favicon.ico" LAST_CHARSET="UTF-8"><img width="16" height="16" src="http://viget.com/favicon.ico" style="margin-right: 0.5em;"/>Effectively Using Git With Subversion | Viget</A><a name="Effectively Using Git With Subversion | Viget" href="#Effectively Using Git With Subversion | Viget" style="margin-left: 0.5em;">¶</a> |
|
2117 |
<DT><A HREF="http://emmanuelbernard.com/blog/2009/01/16/how-to-install-git-and-git-svn-on-mac-os-x/" name="http://emmanuelbernard.com/blog/2009/01/16/how-to-install-git-and-git-svn-on-mac-os-x/" ADD_DATE="1365938585" ICON_URI="http://emmanuelbernard.com/favicon.ico" LAST_CHARSET="UTF-8"><img width="16" height="16" src="http://emmanuelbernard.com/favicon.ico" style="margin-right: 0.5em;"/>Emmanuel Bernard: How to install Git and git-svn on Mac OS X</A><a name="Emmanuel Bernard: How to install Git and git-svn on Mac OS X" href="#Emmanuel Bernard: How to install Git and git-svn on Mac OS X" style="margin-left: 0.5em;">¶</a> |
|
2118 |
<DT><A HREF="http://stackoverflow.com/questions/8015579/add-another-user-to-project-owners-in-github" name="http://stackoverflow.com/questions/8015579/add-another-user-to-project-owners-in-github" ADD_DATE="1378418168" ICON_URI="http://cdn.sstatic.net/stackoverflow/img/favicon.ico" LAST_CHARSET="UTF-8"><img width="16" height="16" src="http://cdn.sstatic.net/stackoverflow/img/favicon.ico" style="margin-right: 0.5em;"/>* git - Add another user to project owners in Github - Stack Overflow</A><a name="* git - Add another user to project owners in Github - Stack Overflow" href="#* git - Add another user to project owners in Github - Stack Overflow" style="margin-left: 0.5em;">¶</a> |
|
2119 |
<DD>"You can only add collaborators to your repository. It cannot be "co-owned"." |
|
2120 |
<DT><a name="git-svn" href="#git-svn"><H3 ADD_DATE="1390256241">git-svn</H3></a> |
|
2121 |
<DL><p> |
|
2122 |
<DT><a name="to migrate from svn" href="#to migrate from svn"><H3 ADD_DATE="1390256292">to migrate from svn</H3></a> |
|
2123 |
<DD>*IMPORTANT*: first put your repository into the standard svn layout (branches, tags, trunk) |
|
2124 |
$ cd <parent_dir_of_checkout> |
|
2125 |
$ time git svn clone --stdlayout https://code.nceas.ucsb.edu/code/projects/bien & # runtime: 15 min ("12m24.338s") |
|
2126 |
# note that it appears to spend 10 min thinking about it, and then at the very end, very quickly downloads your entire repo |
|
2127 |
</DD> |
|
2128 |
<DL><p> |
|
2129 |
<DT><A HREF="http://john.albin.net/git/convert-subversion-to-git" name="http://john.albin.net/git/convert-subversion-to-git" ADD_DATE="1390256214" ICON_URI="http://john.albin.net/sites/all/themes/johnalbin/favicon.ico" LAST_CHARSET="UTF-8"><img width="16" height="16" src="http://john.albin.net/sites/all/themes/johnalbin/favicon.ico" style="margin-right: 0.5em;"/>(some steps in this article are incorrect) Converting a Subversion repository to Git, (7 steps to migrate a complete mirror of svn in git) | JohnAlbin</A><a name="(some steps in this article are incorrect) Converting a Subversion repository to Git, (7 steps to migrate a complete mirror of svn in git) | JohnAlbin" href="#(some steps in this article are incorrect) Converting a Subversion repository to Git, (7 steps to migrate a complete mirror of svn in git) | JohnAlbin" style="margin-left: 0.5em;">¶</a> |
|
2130 |
</DL><p> |
|
2131 |
<DT><A HREF="https://git.wiki.kernel.org/index.php/GitSvnCrashCourse" name="https://git.wiki.kernel.org/index.php/GitSvnCrashCourse" ADD_DATE="1389298877" ICON_URI="https://git.wiki.kernel.org/favicon.ico" LAST_CHARSET="UTF-8"><img width="16" height="16" src="https://git.wiki.kernel.org/favicon.ico" style="margin-right: 0.5em;"/>** GitSvnCrashCourse - Git SCM Wiki</A><a name="** GitSvnCrashCourse - Git SCM Wiki" href="#** GitSvnCrashCourse - Git SCM Wiki" style="margin-left: 0.5em;">¶</a> |
|
2115 | 2132 |
<DD>"here's what you need to use an SVN project: |
2116 | 2133 |
|
2117 | 2134 |
git svn clone --stdlayout url # svn checkout url |
2118 | 2135 |
git svn rebase # svn update |
2119 | 2136 |
git commit -a && git svn dcommit # svn commit |
2120 | 2137 |
" |
2121 |
<DT><A HREF="http://viget.com/extend/a-gaggle-of-git-tips" name="http://viget.com/extend/a-gaggle-of-git-tips" ADD_DATE="1365937554" ICON_URI="http://viget.com/favicon.ico" LAST_CHARSET="UTF-8"><img width="16" height="16" src="http://viget.com/favicon.ico" style="margin-right: 0.5em;"/>A Gaggle Of Git Tips | Viget</A><a name="A Gaggle Of Git Tips | Viget" href="#A Gaggle Of Git Tips | Viget" style="margin-left: 0.5em;">¶</a> |
|
2122 |
<DD>"I use git rebase -i to make sure every commit is clean. For example, when I have two commits with broken code followed by a third clean commit" |
|
2123 |
<DT><A HREF="http://viget.com/extend/effectively-using-git-with-subversion" name="http://viget.com/extend/effectively-using-git-with-subversion" ADD_DATE="1365937443" ICON_URI="http://viget.com/favicon.ico" LAST_CHARSET="UTF-8"><img width="16" height="16" src="http://viget.com/favicon.ico" style="margin-right: 0.5em;"/>Effectively Using Git With Subversion | Viget</A><a name="Effectively Using Git With Subversion | Viget" href="#Effectively Using Git With Subversion | Viget" style="margin-left: 0.5em;">¶</a> |
|
2124 |
<DT><A HREF="http://emmanuelbernard.com/blog/2009/01/16/how-to-install-git-and-git-svn-on-mac-os-x/" name="http://emmanuelbernard.com/blog/2009/01/16/how-to-install-git-and-git-svn-on-mac-os-x/" ADD_DATE="1365938585" ICON_URI="http://emmanuelbernard.com/favicon.ico" LAST_CHARSET="UTF-8"><img width="16" height="16" src="http://emmanuelbernard.com/favicon.ico" style="margin-right: 0.5em;"/>Emmanuel Bernard: How to install Git and git-svn on Mac OS X</A><a name="Emmanuel Bernard: How to install Git and git-svn on Mac OS X" href="#Emmanuel Bernard: How to install Git and git-svn on Mac OS X" style="margin-left: 0.5em;">¶</a> |
|
2125 |
<DT><A HREF="http://stackoverflow.com/questions/8015579/add-another-user-to-project-owners-in-github" name="http://stackoverflow.com/questions/8015579/add-another-user-to-project-owners-in-github" ADD_DATE="1378418168" ICON_URI="http://cdn.sstatic.net/stackoverflow/img/favicon.ico" LAST_CHARSET="UTF-8"><img width="16" height="16" src="http://cdn.sstatic.net/stackoverflow/img/favicon.ico" style="margin-right: 0.5em;"/>* git - Add another user to project owners in Github - Stack Overflow</A><a name="* git - Add another user to project owners in Github - Stack Overflow" href="#* git - Add another user to project owners in Github - Stack Overflow" style="margin-left: 0.5em;">¶</a> |
|
2126 |
<DD>"You can only add collaborators to your repository. It cannot be "co-owned"." |
|
2138 |
</DL><p> |
|
2127 | 2139 |
</DL><p> |
2128 | 2140 |
<DT><A HREF="http://en.wikipedia.org/wiki/Concurrent_Versions_System" name="http://en.wikipedia.org/wiki/Concurrent_Versions_System" ADD_DATE="1366706532" ICON_URI="http://bits.wikimedia.org/favicon/wikipedia.ico" LAST_CHARSET="UTF-8"><img width="16" height="16" src="http://bits.wikimedia.org/favicon/wikipedia.ico" style="margin-right: 0.5em;"/>Concurrent Versions System - Wikipedia, the free encyclopedia</A><a name="Concurrent Versions System - Wikipedia, the free encyclopedia" href="#Concurrent Versions System - Wikipedia, the free encyclopedia" style="margin-left: 0.5em;">¶</a> |
2129 | 2141 |
<DT><A HREF="http://en.wikipedia.org/wiki/Revision_Control_System" name="http://en.wikipedia.org/wiki/Revision_Control_System" ADD_DATE="1366705870" ICON_URI="http://bits.wikimedia.org/favicon/wikipedia.ico" LAST_CHARSET="UTF-8"><img width="16" height="16" src="http://bits.wikimedia.org/favicon/wikipedia.ico" style="margin-right: 0.5em;"/>Revision Control System - Wikipedia, the free encyclopedia</A><a name="Revision Control System - Wikipedia, the free encyclopedia" href="#Revision Control System - Wikipedia, the free encyclopedia" style="margin-left: 0.5em;">¶</a> |
Also available in: Unified diff
web/links/index.htm: updated to Firefox bookmarks. git: added instructions to migrate from svn.