From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server-vie001.gnuweeb.org X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_DBL_BLOCKED_OPENDNS, URIBL_ZEN_BLOCKED_OPENDNS autolearn=ham autolearn_force=no version=3.4.6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gnuweeb.org; s=new2025; t=1754477504; bh=uQUyuU3Vm3AikdrfMmPqNgk4EFtJPkcfmpmjGzVHcI4=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type:Content-Transfer-Encoding:Message-ID:Date:From: Reply-To:Subject:To:Cc:In-Reply-To:References:Resent-Date: Resent-From:Resent-To:Resent-Cc:User-Agent:Content-Type: Content-Transfer-Encoding; b=JWdtAqiK6mAML6lARcbRn0eIPUjqwN1Yi3lo/TdIlacKnxhCSvDnONyxQHUhc3rTk Cv/bwSu/SJWXR9F7vofzyQ/EWxWkxOjC2bq/AMyf7Mp5QZG+rimZUXxH8BdrXq69o2 nm5chPpvKCbIzFhDOwA9Lx2g9AGQde2LipYrg6uJDVuvTkXwag8h0EXhdeJ8sb+xmN x0EBilat80h7UOH6wiKfAx5VU8CKe2TG7kIv0Q1BAQSFcsuuc5C4a8mPrutWoP4Npi aBY+hkFEHgwkAjn1yn7bQFYSaKA+fdiZYxmnUKc4nz9upKjs1Ir18KiweLa7VPtze6 0XpS7N9eHi/yg== Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by server-vie001.gnuweeb.org (Postfix) with ESMTPSA id 863FA3127B58 for ; Wed, 6 Aug 2025 10:51:44 +0000 (UTC) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-b34a78bb6e7so4600996a12.3 for ; Wed, 06 Aug 2025 03:51:44 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCUD6AovP4sfJwGiQ3BNy1MR4iFrjKhy6IyO/6MD9vILjCq2lGTkpRM6iI7+eiwrp/mkDCsk@vger.gnuweeb.org X-Gm-Message-State: AOJu0YyKeRtQiBYSOEvevdNacrDOkoTJVw0c9ws4gxbFucQN9GVZSBeK PBp5SwL52hctoH8OKwL4XKnFyh0CFqxaXe9lRxXZEoGpCnPnXBlhjEzcQIAgPNliZZKN2rlbmwg mOUwXzw09mv+epd9ACKRbsMl2iFZCGRI= X-Google-Smtp-Source: AGHT+IGoFzmJbQfYlu6ueLIoCzdH2mRigVUE7MWtTdymuFBon5SyEIBsJPkDGzcRyKPjtMuJCt2Lg5iKFhq15oa/JDQ= X-Received: by 2002:a17:90b:39cb:b0:315:c77b:37d6 with SMTP id 98e67ed59e1d1-32166cc68e7mr2425742a91.23.1754477502860; Wed, 06 Aug 2025 03:51:42 -0700 (PDT) MIME-Version: 1.0 References: <20250806035727.216702-1-reyuki@gnuweeb.org> <20250806035727.216702-6-reyuki@gnuweeb.org> In-Reply-To: From: Alviro Iskandar Setiawan Date: Wed, 6 Aug 2025 17:51:31 +0700 X-Gmail-Original-Message-ID: X-Gm-Features: Ac12FXxwc1ZA3hCmP9nl9S4rbEAjOas2xGaM-6ZF34QsyJqS8X4FIxz12d5Rm3Y Message-ID: Subject: Re: [PATCH gwproxy v4 5/6] dnsparser: Transaction id creation is delegated to caller To: Ahmad Gani Cc: Ammar Faizi , "GNU/Weeb Mailing List" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable List-Id: On Wed, Aug 6, 2025 at 5:21=E2=80=AFPM Ahmad Gani wrote: > Err.. How do you usually clean up commits like this? I accidentally amend= ed > the changes to the current commit, and splitting it manually without a di= ff > seems like a nightmare. Is there a way to make splitting a patch easier? What do you mean by "splitting it manually without a diff"? I don't understand the exact activity you meant. This splitting problem is because you didn't do it in the first place. I don't often do that. You can unstage the unrelated hunk, then amend a previous commit to apply the same changes where that hunk should be applied. That's just one hunk specific to variable reordering, it should not be a problem. If you had a large chunk, you could copy the hunk and apply it using "git apply" anw. But this one is not a nightmare, this is just one line change. And even If you lost the change due to a mistake in performing "git commit --amend", you can still fetch the old changes from git reflog. And even if your git reflog is fully destroyed, you still have the patches you sent via email that can be reapplied, resulting in the same git history, just that with different SHA1 hashes. -- Viro