vcs:gitfaq

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision		Previous revision
vcs:gitfaq [2019/10/12 09:47] – nikicvcs:gitfaq [2021/04/06 08:00] (current) – rename master to main sergey
Line 5: Line 5:
 ===== Introduction ===== ===== Introduction =====
  
-The PHP git repositories are at http://git.php.net/.  There is a github mirror at https://github.com/php+The PHP git repositories are at https://github.com/php
  
 PEAR repositories are in https://github.com/pear.  This FAQ does not discuss PEAR.   PEAR repositories are in https://github.com/pear.  This FAQ does not discuss PEAR.  
Line 33: Line 33:
 ===== Clone URL and Push URL ==== ===== Clone URL and Push URL ====
  
-Read only urls are +Clone/Push URL
-   +
-  http://git.php.net/repository/php-src.git +
-  git://git.php.net/php-src.git +
- +
-Clone/Push URL (always requires password)+
  
-  https://git.php.net/push/php-src.git+  https://github.com/php/php-src.git
  
 SSH URL SSH URL
      
-  git@git.php.net:php-src.git +  git@github.com:php/php-src.git
  
 Hint: set the push URL (https or git@) with (see also, Quickstart below) Hint: set the push URL (https or git@) with (see also, Quickstart below)
Line 95: Line 90:
 ===== Quickstart ===== ===== Quickstart =====
  
-  $ git clone http://git.php.net/repository/php-src.git+  $ git clone https://github.com/php/php-src.git
   $ cd php-src   $ cd php-src
-  // if you want to push throuh https 
-  $ git config remote.origin.pushurl https://git.php.net/push/php-src.git 
   // update repository   // update repository
   $ git pull --rebase   $ git pull --rebase
Line 109: Line 102:
 Always commit to the oldest branch. If your commit is good for PHP 5.6 and PHP 7.0, commit to PHP 5.6. Then merge your commit. Always commit to the oldest branch. If your commit is good for PHP 5.6 and PHP 7.0, commit to PHP 5.6. Then merge your commit.
  
-  $ git clone http://git.php.net/repository/php-src.git+  $ git clone https://github.com/php/php-src.git
   ....   ....
   $ git branch --track PHP-5.6 origin/PHP-5.6   $ git branch --track PHP-5.6 origin/PHP-5.6
Line 118: Line 111:
   $ git commit Zend/zend.c   $ git commit Zend/zend.c
   $ git checkout PHP-7.0   $ git checkout PHP-7.0
-  $ git merge --log PHP-5.6+  $ git merge PHP-5.6
   $ git checkout master   $ git checkout master
-  $ git merge --log PHP-7.0+  $ git merge PHP-7.0
   $ git push   $ git push
  
Line 132: Line 125:
  
   cd    cd 
-  git clone git@git.php.net:php-src.git+  git clone git@github.com:php/php-src.git
  
 or if you're behind a firewall: or if you're behind a firewall:
  
   cd   cd
-  git clone https://git.php.net/repository/php-src.git+  git clone https://github.com/php/php-src.git
   cd ~/php-src   cd ~/php-src
-  git config remote.origin.pushurl https://git.php.net/push/php-src.git/ 
  
 ==== Recommended: Git worktree ==== ==== Recommended: Git worktree ====
Line 274: Line 266:
  
 ===== Using SSH ==== ===== Using SSH ====
-  * Add your SSH key to your profile on http://master.php.net/manage/users.php +  * Add your SSH key to your profile on https://main.php.net/manage/users.php 
     * you can set multiple keys in separate lines     * you can set multiple keys in separate lines
     * if you get the "the ssh key doesn't seem to have the necessary format" error, check that your key has your email address at the end (it is mandatory currently to have an email address there)     * if you get the "the ssh key doesn't seem to have the necessary format" error, check that your key has your email address at the end (it is mandatory currently to have an email address there)
   * Wait 10 minutes   * Wait 10 minutes
-  * Clone from or set new repository to git@git.php.net:php-src.git+  * Clone from or set new repository to git@github.com:php/php-src.git
     For web git repositories, don't forget the first slash or you'll get an error when committing ("access denied", or "there may be no repository at the given path") :     For web git repositories, don't forget the first slash or you'll get an error when committing ("access denied", or "there may be no repository at the given path") :
-  git config remote.origin.pushurl git@git.php.net:/web/qa.git +  git config remote.origin.pushurl git@github.com:php/php-src.git
  
  
vcs/gitfaq.1570873657.txt.gz · Last modified: 2019/10/12 09:47 by nikic

Page Tools