From: Max Nikulin <manikulin@gmail.com>
To: emacs-orgmode@gnu.org
Subject: Re: ob-shell intentions and paperwork (was Bash results broken?)
Date: Thu, 12 Jan 2023 21:43:01 +0700 [thread overview]
Message-ID: <tpp69m$pt$1@ciao.gmane.io> (raw)
In-Reply-To: <87v8ldatsd.fsf@localhost>
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.
next prev parent reply other threads:[~2023-01-12 15:29 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-16 16:22 Bash results broken? Rudolf Adamkovič
2022-12-16 17:41 ` Ihor Radchenko
2022-12-18 11:19 ` Ihor Radchenko
2022-12-20 0:44 ` Rudolf Adamkovič
2022-12-20 3:40 ` Matt
2022-12-25 11:23 ` Ihor Radchenko
2022-12-26 2:25 ` Matt
2022-12-26 9:26 ` Ihor Radchenko
2022-12-21 6:17 ` ob-shell intentions and paperwork (was Bash results broken?) Matt
2022-12-27 20:48 ` Matt
2022-12-29 11:08 ` Ihor Radchenko
2022-12-29 14:20 ` Bastien Guerry
2022-12-30 5:34 ` Matt
2022-12-30 8:06 ` Bastien Guerry
2022-12-30 18:46 ` Matt
2022-12-31 14:31 ` Ihor Radchenko
2023-01-01 23:55 ` Matt
2023-01-02 9:47 ` Ihor Radchenko
2023-01-02 16:40 ` Matt
2023-01-03 10:50 ` Ihor Radchenko
2023-01-03 13:00 ` Matt
2023-01-05 10:31 ` Ihor Radchenko
2023-01-05 11:21 ` Bastien Guerry
2023-01-10 2:31 ` Matt
2023-01-11 11:53 ` Ihor Radchenko
2023-01-11 16:18 ` Matt
2023-01-11 17:02 ` Ihor Radchenko
2023-01-11 19:34 ` Matt
2023-01-12 8:26 ` Ihor Radchenko
2023-01-12 14:43 ` Max Nikulin [this message]
2023-01-13 9:36 ` Ihor Radchenko
2023-01-13 15:18 ` Matt
2023-01-13 15:23 ` Ihor Radchenko
2023-01-14 7:41 ` Max Nikulin
2023-01-14 10:35 ` Ihor Radchenko
2023-01-14 15:09 ` cgit and merge commit Max Nikulin
2023-01-24 20:16 ` Ihor Radchenko
2022-12-31 12:56 ` ob-shell intentions and paperwork (was Bash results broken?) Ihor Radchenko
2023-01-02 4:40 ` Refactor org-babel-shell-initialize? (was Re: ob-shell intentions and paperwork (was Bash results broken?)) Matt
2023-01-03 9:29 ` Ihor Radchenko
2023-01-05 8:32 ` Ihor Radchenko
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
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='tpp69m$pt$1@ciao.gmane.io' \
--to=manikulin@gmail.com \
--cc=emacs-orgmode@gnu.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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).