Changes between Version 59 and Version 60 of WorkingWithGit


Ignore:
Timestamp:
Oct 30, 2016, 1:14:11 AM (7 years ago)
Author:
larryv (Lawrence Velázquez)
Comment:

remove list of repositories, which is now at FAQ/GitHubMigration#repositories

Legend:

Unmodified
Added
Removed
Modified

  • WorkingWithGit

    v59 v60  
    142142 - 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.
    143143 - 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.
    144 
    145 
    146 === Repository split === #reposplit
    147 
    148 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.
    149 
    150 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].
    151 
    152 ||= Subversion (Mac OS Forge)             =||= Git (GitHub)                                                                    =||
    153 ||trunk/base                               ||macports/macports-base.git                                                         ||
    154 ||trunk/dports                             ||macports/macports-ports.git                                                        ||
    155 ||trunk/dports/{PortIndex,PortIndex.quick} ||''deleted''                                                                        ||
    156 ||trunk/doc-new                            ||macports/macports-guide.git                                                        ||
    157 ||trunk/doc                                ||macports/macports-guide.git, branch "doc-old"                                      ||
    158 ||trunk/www                                ||macports/macports-www.git                                                          ||
    159 ||trunk/base/portmgr/jobs                  ||macports/macports-infrastructure.git, subfolder "jobs"                             ||
    160 ||contrib                                  ||macports/macports-contrib.git                                                      ||
    161 ||contrib/{MacPorts_Framework,Pallet}      ||macports/macports-pallet.git                                                       ||
    162 ||contrib/mpab                             ||macports/macports-buildbot.git, branch "mpab"                                      ||
    163 ||contrib/mp-buildbot                      ||macports/macports-buildbot.git                                                     ||
    164 ||contrib/buildbot                         ||macports/macports-infrastructure.git, branch "buildbot-mpab", subfolder "buildbot" ||
    165 ||contrib/buildbot-test                    ||macports/macports-infrastructure.git, subfolder "buildbot"                         ||
    166 ||users/{dluke,jberry,pipping}             ||''deleted (exceeds GitHub size limit, only contains old files)''                   ||
    167 ||users/*                                  ||''separate repository in'' macports/users-*.git                                    ||
    168 ||distfiles                                ||''deleted''                                                                        ||
    169 ||downloads                                ||''deleted''                                                                        ||
    170 ||branches                                 ||''branches of the appropriate repository/-ies''                                    ||
    171 ||tags                                     ||''annotated tags in the appropriate repository/-ies''                              ||
    172144
    173145