Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:107339
MIME-Version: 1.0
References: <CAFp73XvOp_y7Gz1F4fdBHt1YiMibJ4zdbjrQ+LFxhHYW+-DoHg@mail.gmail.com>
 <44818c1e-07e4-19d5-2ef5-144ccb2b5c05@gmx.de> <CAFp73XvRoPfBFER3ezGXvhiEM3kTrNN1N-95zi8UC=ksExH_1A@mail.gmail.com>
 <CAAwdEzBufQ11iStNC9TjdF+1dCiaCNYqVB7hUikco7TVH2seyQ@mail.gmail.com>
 <CAF+90c_FpsxjDz9yBzSmZProx9XFxpZymcWXXtFdQEdHe7gEUQ@mail.gmail.com>
 <CAAwdEzCOGDBjrMDzZKQpwOYMSN93gq=f8G3ViDe2uO_fjEG=UQ@mail.gmail.com>
 <CAAwdEzAU5ft_PrKfgoAY3J79iTEy8Pn26oKByEtvju4Ur-suwQ@mail.gmail.com>
 <f263e8cd-6aec-ac6c-3c60-fadcbd3ebc9a@gmx.de> <CAAwdEzDB_RqMbqTJ9C8LZ_gug-wkFPbDhVzbCrfSWNS8J+D7bw@mail.gmail.com>
 <3628f06b-3c07-6a82-0aee-6a927c21a44d@gmx.de> <CAAwdEzBB+5VGEBS41nq_no8_BybhXXxvuVgyvT9wMBhF=bW7oQ@mail.gmail.com>
 <8cb2f498-6627-a412-ec65-dea8275c3199@gmx.de>
In-Reply-To: <8cb2f498-6627-a412-ec65-dea8275c3199@gmx.de>
Date: Fri, 27 Sep 2019 12:25:30 +0300
Message-ID: <CAAwdEzCgg3z+PsupwPMyJ8Fnj4sHmKtqZ8mSEL_T62A6orMxSA@mail.gmail.com>
To: "Christoph M. Becker" <cmbecker69@gmx.de>
Cc: Nikita Popov <nikita.ppv@gmail.com>, 
	"guilhermeblanco@gmail.com" <guilhermeblanco@gmail.com>, PHP internals <internals@lists.php.net>
Content-Type: multipart/alternative; boundary="0000000000009eabb40593857855"
Subject: Re: [PHP-DEV] Re: Question about merged PR #937
From: drealecs@gmail.com (=?UTF-8?Q?Alexandru_P=C4=83tr=C4=83nescu?=)

--0000000000009eabb40593857855
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi Christoph,

The method you described looks great.
Squashing with rebase interactive works fine, with choosing what commits to
keep and what commits to squash into the kept ones.
This can be done by merger or author.

Merging a pull request with squashing in github will set the author's
commit to the person who merge it.
The same things happens with *git merge --squash <branch>*

If you agree, what would be the best way to propagate this information so
that everyone use this method, when squashing is needed?

Regards,
Alex


On Sun, Sep 22, 2019 at 3:03 PM Christoph M. Becker <cmbecker69@gmx.de>
wrote:

> On 20.09.2019 at 12:59, Alexandru P=C4=83tr=C4=83nescu wrote:
>
> > Can you let us know what you used as it's doing the job well :)
> > CLI git merge or another UI; which one?
>
> I'm usually using TortoiseGit, but basically I'm doing
>
>     git rebase -i HEAD~<number of commits to squash>
>
> > I'm also curious what will happen if there would be two authors on the
> same
> > branch/pull request.
> > Is it interactive or pre-configured to use author of the first commit,
> last
> > commit, most of the commits?
>
> In this case I likely would not squash commits of different authors.  An
> alternative would be to append the following to the commit message:
>
>     Co-authored-by: name <name@example.com>
>
> --
> Christoph M. Becker
>

--0000000000009eabb40593857855--