From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: ** X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_SBL_CSS autolearn=no autolearn_force=no version=3.4.4 Received: from txout-a2-smtp.messagingengine.com (txout-a2-smtp.messagingengine.com [103.168.172.225]) by inbox.vuxu.org (Postfix) with ESMTP id 012BD2275C for ; Mon, 13 Jan 2025 07:24:18 +0100 (CET) Received: from localhost.localdomain (kubehost04.phl.internal [10.202.3.4]) by mailtxout.phl.internal (Postfix) with ESMTP id 9DA34238029C for ; Mon, 13 Jan 2025 01:24:17 -0500 (EST) ARC-Authentication-Results: i=2; topicbox.com; arc=pass; dkim=pass (1024-bit rsa key sha1) header.d=eigenstate.org header.i=@eigenstate.org header.b=aZRcxGca header.a=rsa-sha1 header.s=mail x-bits=1024; dmarc=pass policy.published-domain-policy=none policy.applied-disposition=none policy.evaluated-disposition=none (p=none,d=none,d.eval=none) policy.policy-from=p header.from=eigenstate.org; spf=pass smtp.mailfrom=ori@eigenstate.org smtp.helo=mimir.eigenstate.org; x-internal-arc=fail (as.1.topicbox.com=pass, ams.1.topicbox.com=fail (message has been altered)) (Message modified while forwarding at Topicbox) ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d= topicbox.com; h=message-id:to:subject:date:from:in-reply-to :mime-version:content-type:content-transfer-encoding:list-help :list-id:list-post:list-subscribe:reply-to:list-unsubscribe; s= sysmsg-1; t=1736749457; bh=fMTkISGG4pn3P/DvEuVc3rMqpjUXAskaV2Lit URpP8s=; b=B/bGc1R+yDS7GmeKPY59ThSJBDVHCW3m5Bs9HYmX0ujPalO5TSBu2 v1tJeCwD23XhIF1M9WUyV6bXiOVAVTdXOr0mXrHTrMKBT04paZ4ICJHMU43MiqE0 Sdplc6S8dyvUdVjvvxq2gZqG3fQOI/7tPE9X3mFj/1S2sswJzOtx+8= ARC-Seal: i=2; a=rsa-sha256; cv=pass; d=topicbox.com; s=sysmsg-1; t= 1736749457; b=PNoY11JxzxQnLIro8QyBc24ED/j/BDHHFO0rdMaqqLvcogSLSh 1Y5mD8WHPoeep+pXzNU/BE5yC9LOLjOIjFVY3lA3uZodcBNBR84egUjI0VXN2tXh e2BqxSdtjWIXnTG1t6jRoL41rLZXkAnMgt+0iSXB0Y/fOqvt8RQqito48= Authentication-Results: topicbox.com; arc=pass; dkim=pass (1024-bit rsa key sha1) header.d=eigenstate.org header.i=@eigenstate.org header.b=aZRcxGca header.a=rsa-sha1 header.s=mail x-bits=1024; dmarc=pass policy.published-domain-policy=none policy.applied-disposition=none policy.evaluated-disposition=none (p=none,d=none,d.eval=none) policy.policy-from=p header.from=eigenstate.org; spf=pass smtp.mailfrom=ori@eigenstate.org smtp.helo=mimir.eigenstate.org; x-internal-arc=fail (as.1.topicbox.com=pass, ams.1.topicbox.com=fail (message has been altered)) (Message modified while forwarding at Topicbox) X-Received-Authentication-Results: mx.topicbox.com; arc=none (no signatures found); bimi=skipped (DMARC Policy is not at enforcement); dkim=pass (1024-bit rsa key sha1) header.d=eigenstate.org header.i=@eigenstate.org header.b=aZRcxGca header.a=rsa-sha1 header.s=mail x-bits=1024; dmarc=pass policy.published-domain-policy=none policy.applied-disposition=none policy.evaluated-disposition=none (p=none,d=none,d.eval=none) policy.policy-from=p header.from=eigenstate.org; iprev=pass smtp.remote-ip=206.124.132.107 (mimir.eigenstate.org); spf=pass smtp.mailfrom=ori@eigenstate.org smtp.helo=mimir.eigenstate.org; x-aligned-from=pass (Address match); x-me-sender=none; x-ptr=pass smtp.helo=mimir.eigenstate.org policy.ptr=mimir.eigenstate.org; x-return-mx=pass header.domain=eigenstate.org policy.is_org=yes (MX Records found: nokogiri.pikopiko.org,mail.pikopiko.org,kusuri.pikopiko.org,eigenstate.org); x-return-mx=pass smtp.domain=eigenstate.org policy.is_org=yes (MX Records found: nokogiri.pikopiko.org,eigenstate.org,mail.pikopiko.org,kusuri.pikopiko.org); x-tls=pass smtp.version=TLSv1.2 smtp.cipher=ECDHE-RSA-AES256-GCM-SHA384 smtp.bits=256/256; x-vs=clean score=0 state=0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=9fans.net; h=message-id :to:subject:date:from:in-reply-to:mime-version:content-type :content-transfer-encoding:list-help:list-id:list-post :list-subscribe:reply-to:list-unsubscribe; s=dkim-1; t= 1736749457; x=1736835857; bh=cIbq1aBzCau3JxIfTm3rqq8WsWXdlCLDDr5 rDr2qKdY=; b=Nbgsmbxo74PjBsL9Rhi99EPEpvfFTV6QB07bHCvpICgYOkUaJor hwewHlq3LZM9qPdIt2IDw5UzsQNGxTi5bYNjyC8/399YwaCrQJEe1St291YOqD3T ajoZASPcbesZMDsO+QXCv45gaThAa0XprJg3uN81FEQ+uyeZBZy3aLYE= Received: from mx.topicbox.com (10-0-1-229.authmilter.topicbox.svc.cluster.local [10.0.1.229]) by tb-mx-2.topicbox.com (Postfix) with ESMTP id B561F100318CF8C9 for <9fans@9fans.net>; Mon, 13 Jan 2025 01:03:27 -0500 (EST) Received: from tb-mx-1.topicbox.com (10.0.1.62 [10.0.1.62]) by mx.topicbox.com (Authentication Milter) with ESMTP id 4731739B464; Mon, 13 Jan 2025 01:03:27 -0500 ARC-Seal: i=1; a=rsa-sha256; cv=none; d=topicbox.com; s=arcseal; t= 1736748207; b=IJ58utazEolxxNrpvwaHNh9Np68NIra8NwQxJFFYLDZxWog4jB nP9yvNYVGXbhTdbs1Iyp5zlynJ5BA5+4lQ29UBe4rUT1W7bOpnvGHGV7QHApTqpT KzZuVKKmDu4YjZ1C+7AFvhclPStzp7EzbeRFocNUdbI3i6hKq4mzLl1McOWCVHgr 68enf+b5VLZIah1GJ/Ojhxd7rcKuZpYFwmgfGK2PJ9lH85V5HrMzNAoV1lD/ibHe oz2hABVk5s/h/RVpiPK2RLJ2S7wZNH/UY9TZnBDbGNF2xlbFOGmoEpmujdY7fe/H B7u/NKPZtmeNWZYKw3O99jvuet9mq/uLK/xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= topicbox.com; h=message-id:to:subject:date:from:in-reply-to :mime-version:content-type:content-transfer-encoding; s=arcseal; t=1736748207; bh=hTs7lcy788LF5tMBD7VDpigxyehTV6saIoq7wB18prA=; b= PabNd3bi6t+JIRUocd08of1LkTx2IPR/nc+X4+zZDtfrl0Zso1aqJAjmJeapUmfy JGZ2qTy58AFxjOt1SHjcA6YYYRL/noNncqtOOldWKC9B2NDXWfdKjPyawofPOW5Y rrVdTonCNy/+9U2Hwe2gjgg1WAy6ZjaIBBI4861Rpx6mAgclPLrPZ0E66+rQSpWj viQxvQO8nh7q1VN8RSm0vIIW0HMn8BXjwEaH4WuuRPjWfQNLAq7J1amfaqb5dWYH jOBOFib405QnGs+Irh2GvWn4HbKGyUypTykU0Ew+xcya/mJdcJaOBmCqjFs/c5BI L4+J8I5PQuAOi0bzyJ/1pA== ARC-Authentication-Results: i=1; mx.topicbox.com; arc=none (no signatures found); bimi=skipped (DMARC Policy is not at enforcement); dkim=pass (1024-bit rsa key sha1) header.d=eigenstate.org header.i=@eigenstate.org header.b=aZRcxGca header.a=rsa-sha1 header.s=mail x-bits=1024; dmarc=pass policy.published-domain-policy=none policy.applied-disposition=none policy.evaluated-disposition=none (p=none,d=none,d.eval=none) policy.policy-from=p header.from=eigenstate.org; iprev=pass smtp.remote-ip=206.124.132.107 (mimir.eigenstate.org); spf=pass smtp.mailfrom=ori@eigenstate.org smtp.helo=mimir.eigenstate.org; x-aligned-from=pass (Address match); x-me-sender=none; x-ptr=pass smtp.helo=mimir.eigenstate.org policy.ptr=mimir.eigenstate.org; x-return-mx=pass header.domain=eigenstate.org policy.is_org=yes (MX Records found: nokogiri.pikopiko.org,mail.pikopiko.org,kusuri.pikopiko.org,eigenstate.org); x-return-mx=pass smtp.domain=eigenstate.org policy.is_org=yes (MX Records found: nokogiri.pikopiko.org,eigenstate.org,mail.pikopiko.org,kusuri.pikopiko.org); x-tls=pass smtp.version=TLSv1.2 smtp.cipher=ECDHE-RSA-AES256-GCM-SHA384 smtp.bits=256/256; x-vs=clean score=0 state=0 X-ME-VSCause: gggruggvucftvghtrhhoucdtuddrgeefuddrudehfedgkeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefkvffuff fhjgggtgfgsehtjeejtddttddvnecuhfhrohhmpehorhhisegvihhgvghnshhtrghtvgdr ohhrghenucggtffrrghtthgvrhhnpedvhedtfeefteeglefhgeekhefhuefhhedvvdeiud euheejteegveekiedtveeuhfenucfkphepvddtiedruddvgedrudefvddruddtjedpudej vddrheekrddvheegrdeivdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepih hnvghtpedvtdeirdduvdegrddufedvrddutdejpdhhvghlohepmhhimhhirhdrvghighgv nhhsthgrthgvrdhorhhgpdhmrghilhhfrhhomhepoehorhhisegvihhgvghnshhtrghtvg drohhrgheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepoeelfhgrnhhsseelfhgr nhhsrdhnvghtqe X-ME-VSScore: 0 X-ME-VSCategory: clean Received-SPF: pass (eigenstate.org: 206.124.132.107 is authorized to use 'ori@eigenstate.org' in 'mfrom' identity (mechanism 'ip4:206.124.132.96/28' matched)) receiver=mx.topicbox.com; identity=mailfrom; envelope-from="ori@eigenstate.org"; helo=mimir.eigenstate.org; client-ip=206.124.132.107 Received: from mimir.eigenstate.org (mimir.eigenstate.org [206.124.132.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tb-mx-1.topicbox.com (Postfix) with ESMTPS for <9fans@9fans.net>; Mon, 13 Jan 2025 01:03:27 -0500 (EST) Received: from mimir.eigenstate.org (localhost [127.0.0.1]) by mimir.eigenstate.org (OpenSMTPD) with ESMTP id 2ca5c922 for <9fans@9fans.net>; Sun, 12 Jan 2025 22:03:26 -0800 (PST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=eigenstate.org; h=message-id :to:subject:date:from:in-reply-to:mime-version:content-type :content-transfer-encoding; q=dns; s=mail; b=Gqft9f/U+9wVn1AcC4k CqvC3F6ldxJCLpW9Rp7/25tsNtCdTTVHaIdyzvn18Kq19CBRnmaMX+AdtdalqATB fl64lM1zoERC8eoTKNUULLi5/pC0jgLxAsp6MIcMMEpeus4z7pWaDdRy5nWBOybh AYI+ERcxAGX0cfElSyvS/4y8= Received: from chainsaw ( [172.58.254.62]) by mimir.eigenstate.org (OpenSMTPD) with ESMTPSA id 281a9ee4 (TLSv1.2:ECDHE-RSA-AES256-SHA:256:NO) for <9fans@9fans.net>; Sun, 12 Jan 2025 22:03:25 -0800 (PST) Message-ID: To: 9fans@9fans.net Subject: Re: [9fans] Re: Git usage Date: Mon, 13 Jan 2025 00:59:12 -0500 From: ori@eigenstate.org In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Topicbox-Policy-Reasoning: moderate: sender is a member; group holds all messages Topicbox-Message-UUID: 1c889656-d174-11ef-8e66-3485d6973bdc Archived-At: =?UTF-8?B?PGh0dHBzOi8vOWZhbnMudG9waWNib3guY29tL2dyb3Vwcy85?= =?UTF-8?B?ZmFucy9UYzMwOTQ0NTAyOTU4ZTFhMC1NZGExNjUxNjFiMWU4NzAwZDc4OGM0?= =?UTF-8?B?ZmFjPg==?= List-Help: List-Id: "9fans" <9fans.9fans.net> List-Post: List-Software: Topicbox v0 List-Subscribe: Precedence: list Reply-To: 9fans <9fans@9fans.net> List-Unsubscribe: , Topicbox-Delivery-ID: 2:9fans:437d30aa-c441-11e9-8a57-d036212d11b0:522be890-2105-11eb-b15e-8d699134e1fa:Mda165161b1e8700d788c4fac:1:Gpucymbdok1_VcKyiFQbDxRGdFokKwpp21xuzhfLaBA Quoth Paul Lalonde : > Ah, yes, my dev history involves git in very large repos with too many > committers. The probability that you won't have to rebase to catch up to > main was approximately zero, so that just becomes part of the workflow. = If > you're the only person working in a section of the tree then it's trivial > and just runs automatically. >=20 > You may well have fixed it. I realized that I hadn't done an update after > installing this cpu/disk server, so did that. I'll report if I run into > the grief again. >=20 > Also, is there a reason why git/rebase -i doesn't have a "drop" option? I > use it frequently when I find myself with a duplicate change from messing > up my github fork synchronizations. >=20 here's a quick diff I haven't yet tested for implementing drop -- let me kn= ow if it does the job for you: diff 2339cfc51541b3f62a7a92d67885b1918f8570c1 uncommitted --- a/sys/src/cmd/git/rebase +++ b/sys/src/cmd/git/rebase @@ -59,6 +59,8 @@ echo $item c=3D$item(2) switch($item(1)){ + case d drop + # nothing to do case p pick git/export $c | git/import case r reword ------------------------------------------ 9fans: 9fans Permalink: https://9fans.topicbox.com/groups/9fans/Tc30944502958e1a0-Mda165= 161b1e8700d788c4fac Delivery options: https://9fans.topicbox.com/groups/9fans/subscription