php.net |  support |  documentation |  report a bug |  advanced search |  search howto |  statistics |  random bug |  login

go to bug id or search bugs for

Doc Bug #62611 Wrong git directions
Submitted: 2012-07-19 14:14 UTC Modified: 2012-07-20 03:04 UTC
From: lonnyk at gmail dot com Assigned: kriscraig (profile)
Status: Closed Package: Documentation problem
PHP Version: Irrelevant OS:
Private report: No CVE-ID: None
View Developer Edit
Welcome back! If you're the original bug submitter, here's where you can edit the bug or add additional notes.
If you forgot your password, you can retrieve your password here.
Password:
Status:
Package:
Bug Type:
Summary:
From: lonnyk at gmail dot com
New email:
PHP Version: OS:

 

 [2012-07-19 14:14 UTC] lonnyk at gmail dot com 
Description:
------------
https://wiki.php.net/vcs/gitworkflow has wrong directions for 'Workflow for 
external contributors'.

After `git remote...` you need to call `git fetch upstream` and the rebase needs 
to be `git pull --rebase upstream PHP-5.4 (or use upstream master)`.

Patches

Pull Requests

History

AllCommentsChangesGit/SVN commitsRelated reports
 [2012-07-19 14:22 UTC] lonnyk at gmail dot com 
Actually, I we can just change the rebase and leave out the `git fetch upstream`
 [2012-07-20 02:08 UTC] aharvey@php.net
-Status: Open +Status: Closed -Assigned To: +Assigned To: kriscraig
 [2012-07-20 02:08 UTC] aharvey@php.net 
I believe Kris has fixed this, per Internals.
 [2012-07-20 03:04 UTC] kriscraig@php.net 
Yep confirmed, I fixed it.
 
PHP Copyright © 2001-2026 The PHP Group
All rights reserved. 		Last updated: Wed Oct 07 08:00:02 2026 UTC