From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id EDy2KlonwGOfCwAAbAwnHQ (envelope-from ) for ; Thu, 12 Jan 2023 16:29:30 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id EBOoKlonwGPuBgAA9RJhRA (envelope-from ) for ; Thu, 12 Jan 2023 16:29:30 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 674441DB90 for ; Thu, 12 Jan 2023 16:29:30 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFynW-00018y-Nr; Thu, 12 Jan 2023 09:43:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFynT-00017e-Ag for emacs-orgmode@gnu.org; Thu, 12 Jan 2023 09:43:15 -0500 Received: from ciao.gmane.io ([116.202.254.214]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFynR-000437-R5 for emacs-orgmode@gnu.org; Thu, 12 Jan 2023 09:43:14 -0500 Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1pFynP-0000TO-NA for emacs-orgmode@gnu.org; Thu, 12 Jan 2023 15:43:11 +0100 X-Injected-Via-Gmane: http://gmane.org/ To: emacs-orgmode@gnu.org From: Max Nikulin Subject: Re: ob-shell intentions and paperwork (was Bash results broken?) Date: Thu, 12 Jan 2023 21:43:01 +0700 Message-ID: References: <878rj7s0ti.fsf@localhost> <1853354beb4.fce54d8d902653.6359367327256505471@excalamus.com> <18555580d75.d7b471f9370716.1497263973038999899@excalamus.com> <87edsiv54k.fsf@localhost> <18561866f8c.f22a62b3866025.8634474263936272339@excalamus.com> <185645af285.f16730c9981316.8238066002530458068@excalamus.com> <87zgb38x0v.fsf@localhost> <1856fc2c9c4.d213558d30469.8133539665325553154@excalamus.com> <87a631mfoh.fsf@localhost> <185735abcf4.b0102402156950.2510703238208758946@excalamus.com> <875ydnki3a.fsf@localhost> <18577b7fcbe.dfdb6dda342902.3241742984579519702@excalamus.com> <87lemhff2l.fsf@localhost> <87o7rdqlar.fsf@gnu.org> <1859984c802.106237dc2574863.4454761455185125920@excalamus.com> <87zgape18a.fsf@localhost> <185a19ff424.d7f83d9b1104611.2590624521284135337@excalamus.com> <87v8ldatsd.fsf@localhost> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Content-Language: en-US In-Reply-To: <87v8ldatsd.fsf@localhost> Received-SPF: pass client-ip=116.202.254.214; envelope-from=geo-emacs-orgmode@m.gmane-mx.org; helo=ciao.gmane.io X-Spam_score_int: 26 X-Spam_score: 2.6 X-Spam_bar: ++ X-Spam_report: (2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FORGED_MUA_MOZILLA=2.309, FREEMAIL_FORGED_FROMDOMAIN=0.067, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NICE_REPLY_A=-0.001, NML_ADSP_CUSTOM_MED=0.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1673537370; a=rsa-sha256; cv=none; b=bHs06AFcf5VI1JBKWxZs51nWz9qo7Dzet05X5cD3nyDzzHx+G9s6I/q5R/p7v8EELxISx5 RwiptTVr5xaJDLg3aH87qtkPwLvz9WUwJUYAuQnWT4Iz1aZvVpmn5W4fB+aU8DEf+pe6Js 9jtywdqN/Pb/g6kXKhlAbhMRPpP47f8tcEhjwPtITTeDBpM+i586zc09rYXm6z+aqOFlJP jUeivehSLTDkk505D7cOk0NYKAmhgogOHb5NjW9n+mCVWkJJprWhPMqlficlrJyboWar2J YUBTwlQ454dkoeB9kKqE4DghlpGC8XmNlUUEYnKNJ5rHSQqJibc4yJzUrrwxfw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1673537370; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ZYu5EQcjec68KCgyK3lVgK+tXACbwq7CgTQytvFw/Ts=; b=MdGmYKy/KqHxGojM4Y+LSLxkjJUdxEDqfmeSx7im0A1yU1ZWTXTw+NlDeBk5uFK8PcffFL eQUMZefHhkApC4T8YvQde1q8ROKgVPTE6XrbH7zWVOLxEBtfgz7bB1UFxlNDvtusdCU658 d6Cb2UIRbACIH3EYvZF1KfMv4ltkKttUG5zEdb9cJfWQ8OLa7it7O6nf15m5Gj3mxADm4F qesgzji+3Az7TLPpo/InT5DC3oRIF+ebqeSMnHhqdDKevz1F4iIzfNcXCnE6HXYERXG98r Fks9Ff2r5/zLslzviy7zuRMqD4Pc1M6Q7dqI+JrYCpLYUuBHdO5QExuYHmwvGA== X-Migadu-Spam-Score: -0.80 X-Spam-Score: -0.80 X-Migadu-Queue-Id: 674441DB90 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none) X-TUID: QLR/z8kr0l/L On 12/01/2023 00:02, Ihor Radchenko wrote: >> I was not, thank you. I've since pushed. > > This: > https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=4f319088ba5f11d4b6adf808f39f11dfa52c08e4 > ? > > It looks like you lost all the individual commits and commit messages in > the process. Ihor, it is usual merge commit of a branch with multiple commits. Cgit shows combined changes, but commits was not squashed. The branch started at dff9565c2c8bb7fe100c5278136d3de22ce41051 Bastien 2022-12-30 09:17:38 +0100 It would be better to do git fetch git rebase origin/main before merging the branch to make git history more linear. To ensure fast forward merge it is possible to add --ff-only option to git merge.