<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<p>Hi all,</p>
<p>thanks to all who helped me. Hopefully I've now created a
reasonable PR#7517. Of course if some fine tuning is necessary let
me know to change/fix.<br>
</p>
<p>kind regards,</p>
<p> Frtiz<br>
</p>
<div class="moz-cite-prefix">Am 03.01.2022 um 16:01 schrieb Nona
Hansel:<br>
</div>
<blockquote type="cite"
cite="mid:OpenIndiana%2Foi-userland%2Fpull%2F7496%2Fc1004150263@github.com">
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<p dir="auto">I know how I would proceed if I were to get rid of
some commits: I would create a brand new branch and cherry-pick
relevant commits to this branch. After that, I would create a
new PR submitting the new branch. I would do this to avoid any
commit removal because these procedures makes me nervous. So I
would do this:</p>
<ol dir="auto">
<li>on the branch where I have all the commits, I would <code>git
log</code> to see the commits with their hash which is the
long sequence of number and letters (or maybe it is
hexadecimal number? sorry for my ignorance) after the word
commit, for example ff5a5696227e0794bddfc6dd89b401f13b9a78ea</li>
<li>I would create a brand new branch from oi/hipster which
should be up to date (this can be done by <code>git fetch
upstream</code> and after that <code>git rebase
upstream/oi/hipster</code>)<br>
creating new branch: <code>git checkout -b new_branch</code></li>
<li>on this new_branch, I would <code>git cherry-pick
hash_of_relevant_commit</code> which makes a copy of that
commit and apply it in new_branch. You can cherry-pick as many
commits as you need.</li>
</ol>
<p dir="auto">The advantage of this procedure is that it leaves
this branch (meaning the old one) intact, just in case.</p>
<p dir="auto">If the PR is about adding a component, it should
contain one commit. In case that the change is currently part of
several commits, these commits should be squashed after they're
cherry-picked to new_branch. If you need help with that, I can
provide some guidance so feel free to write me.</p>
<p
style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br>
Reply to this email directly, <a
href="https://github.com/OpenIndiana/oi-userland/pull/7496#issuecomment-1004150263"
moz-do-not-send="true">view it on GitHub</a>, or <a
href="https://github.com/notifications/unsubscribe-auth/AW7A7VRCEJZYCLGEL7JKZYLUUG24FANCNFSM5LAFQ4FA"
moz-do-not-send="true">unsubscribe</a>.<br>
Triage notifications on the go with GitHub Mobile for <a
href="https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675"
moz-do-not-send="true">iOS</a> or <a
href="https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub"
moz-do-not-send="true">Android</a>.
<br>
You are receiving this because you authored the thread.<img
src="https://github.com/notifications/beacon/AW7A7VWUPQUUVNYP2HNU5Z3UUG24FA5CNFSM5LAFQ4FKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOHPNB35Y.gif"
alt="" moz-do-not-send="true" width="1" height="1"><span
style="color: transparent; font-size: 0; display: none;
visibility: hidden; overflow: hidden; opacity: 0; width: 0;
height: 0; max-width: 0; max-height: 0; mso-hide: all">Message
ID: <span><OpenIndiana/oi-userland/pull/7496/c1004150263</span><span>@</span><span>github</span><span>.</span><span>com></span></span></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/OpenIndiana/oi-userland/pull/7496#issuecomment-1004150263",
"url": "https://github.com/OpenIndiana/oi-userland/pull/7496#issuecomment-1004150263",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>
</blockquote>
</body>
</html>