> -Original Message-
> From: Stanislav Malyshev [mailto:smalys...@gmail.com]
> Sent: Thursday, May 21, 2015 9:28 AM
> To: Remi Collet; internals@lists.php.net
> Subject: Re: [PHP-DEV] About merging Pull Request workflow
>
> Hi!
>
> > Current w
Hi,
> -Original Message-
> From: Remi Collet [mailto:r...@fedoraproject.org]
> Sent: Thursday, May 21, 2015 9:17 AM
> To: internals@lists.php.net
> Subject: [PHP-DEV] About merging Pull Request workflow
>
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA1
>
>
Hi!
> Current workflow described in
> https://wiki.php.net/vcs/gitworkflow#merge_a_pull_request
>
> Problem, git history only give info about a "merge"
If you merge from a pull, the history should contain both original
commit and the merge commit. So you know both who created the patch and
who m
Yep, is a real problem. We should keep the credit / commit info.
I think we should remove "--no-ff" so it would just add the relevant
commits instead of actually merging them
without history (or even rebase the pull request to recent branch before
merging).
Kaplan
On Thu, May 21, 2015 at 10:16
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Hi,
Current workflow described in
https://wiki.php.net/vcs/gitworkflow#merge_a_pull_request
Problem, git history only give info about a "merge"
Ex, after merging 1278:
http://git.php.net/?p=php-src.git;a=commit;h=eef762d576e7744d6e0c8d6a3f997fe911
