From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: adobe-flash-plugin: update to 32.0.0.414
Date: Thu, 20 Aug 2020 20:48:45 +0200 [thread overview]
Message-ID: <20200820184845.afvXpWLJTLK86mlDCVSRjtP2GbaiAs2EzNyauLzbXw8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24392@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1453 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/24392#issuecomment-677836377
Comment:
Please don't duplicate and close PRs, it adds extra noise and complicates tracking the evolution of requests.
To squash commits in #24379 you could have done, in your local git repo (assuming `upstream` is a remote reference to https://github.com/void-linux/void-packages and `origin` is a remote reference to your personal fork):
```
git switch adobe-flash-plugin
git pull --rebase upstream master
git rebase --interactive upstream/master
```
This will open an editor to allow you to modify the history of commits you've made on top of `upstream/master`. Leave the first `pick` line alone, and change the `pick` references of every other commit to `squash`, then save and quit the editor. A new editor instance will open asking you to edit the commit message for the new squashed message, which you can change as needed, save and quit. The result should be a new, single commit representing a composite of all the changes you made. Finally, `git push -f origin adobe-flash-plugin` will force-push your new history to the branch tracked in the PR.
Alternatively, you could have created a new local branch from `upstream/master`, made the commit however you saw fit, and then done `git push -f origin adobe-flash-plugin` to replace the contents of your remote branch with the new, simplified history.
next prev parent reply other threads:[~2020-08-20 18:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-20 18:37 [PR PATCH] " Generekalipsa
2020-08-20 18:48 ` ahesford [this message]
2020-08-20 18:52 ` [PR PATCH] [Closed]: " ahesford
2020-08-20 18:57 ` Generekalipsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200820184845.afvXpWLJTLK86mlDCVSRjtP2GbaiAs2EzNyauLzbXw8@z \
--to=ahesford@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).