[MacPorts] WorkingWithGit modified

MacPorts noreply at macports.org
Sun Oct 30 02:14:11 CET 2016


Page "WorkingWithGit" was changed by larryv
Diff URL: <https://trac.macports.org/wiki/WorkingWithGit?action=diff&version=60>
Revision 60
Comment: remove list of repositories, which is now at [[FAQ/GitHubMigration#repositories]]
Changes:
-------8<------8<------8<------8<------8<------8<------8<------8<--------
Index: WorkingWithGit
=========================================================================
--- WorkingWithGit (version: 59)
+++ WorkingWithGit (version: 60)
@@ -141,34 +141,6 @@
  - To drop uncommitted modifications, use `git checkout -- <filename>`. If you had already added the file to the index using `git add`, you have to unstage it first using `git reset HEAD <filename>`. `git status` prints these commands, so you don't have to remember them.
  - To undo a change that has already been committed and pushed, use `git revert <commitID>`. This will create a new commit that applies the inverse diff. Note that you still have to push this commit to publish it.
  - To throw away all changes that you have locally committed but not yet pushed, use `git reset --hard origin/master`. '''You will lose all your uncommitted and committed modifications.''' If that is not what you want, Git provides a variety of tools that allow you to change commits that you have not pushed yet (and theoretically also commits that have already been pushed, which will prevent you from pushing any changes again). Since this is an advanced topic it will not be covered here. As a pointer for further research, look for `git commit --amend` to change the topmost commit and `git rebase --interactive`, the so-called "interactive rebase", to change older commits.
-
-
-=== Repository split === #reposplit
-
-Unlike Subversion, Git does not permit selective checkout of individual subdirectories. As part of the GitHub migration, the Subversion repository has been restructured into several smaller Git repositories so that contributors don't have to clone the entire project.
-
-Here is a summary of the restructuring; the full set of [https://techbase.kde.org/Projects/MoveToGit/UsingSvn2Git svn2git] conversion rules is available on [https://github.com/neverpanic/macports-svn2git-rules/blob/master/gitconversion.rules Clemens Lang's GitHub].
-
-||= Subversion (Mac OS Forge)             =||= Git (GitHub)                                                                    =||
-||trunk/base                               ||macports/macports-base.git                                                         ||
-||trunk/dports                             ||macports/macports-ports.git                                                        ||
-||trunk/dports/{PortIndex,PortIndex.quick} ||''deleted''                                                                        ||
-||trunk/doc-new                            ||macports/macports-guide.git                                                        ||
-||trunk/doc                                ||macports/macports-guide.git, branch "doc-old"                                      ||
-||trunk/www                                ||macports/macports-www.git                                                          ||
-||trunk/base/portmgr/jobs                  ||macports/macports-infrastructure.git, subfolder "jobs"                             ||
-||contrib                                  ||macports/macports-contrib.git                                                      ||
-||contrib/{MacPorts_Framework,Pallet}      ||macports/macports-pallet.git                                                       ||
-||contrib/mpab                             ||macports/macports-buildbot.git, branch "mpab"                                      ||
-||contrib/mp-buildbot                      ||macports/macports-buildbot.git                                                     ||
-||contrib/buildbot                         ||macports/macports-infrastructure.git, branch "buildbot-mpab", subfolder "buildbot" ||
-||contrib/buildbot-test                    ||macports/macports-infrastructure.git, subfolder "buildbot"                         ||
-||users/{dluke,jberry,pipping}             ||''deleted (exceeds GitHub size limit, only contains old files)''                   ||
-||users/*                                  ||''separate repository in'' macports/users-*.git                                    ||
-||distfiles                                ||''deleted''                                                                        ||
-||downloads                                ||''deleted''                                                                        ||
-||branches                                 ||''branches of the appropriate repository/-ies''                                    ||
-||tags                                     ||''annotated tags in the appropriate repository/-ies''                              ||
 
 
 
-------8<------8<------8<------8<------8<------8<------8<------8<--------

--
Page URL: <https://trac.macports.org/wiki/WorkingWithGit>
MacPorts <https://www.macports.org/>
Ports system for OS X

This is an automated message. Someone added your email address to be
notified of changes on 'WorkingWithGit' page.
If it was not you, please report to admin at macports.org.


More information about the macports-changes mailing list