From: Max Nikulin <manikulin@gmail.com>
To: emacs-orgmode@gnu.org
Subject: Re: ob-shell intentions and paperwork (was Bash results broken?)
Date: Sat, 14 Jan 2023 14:41:53 +0700 [thread overview]
Message-ID: <tptmc2$3vs$1@ciao.gmane.io> (raw)
In-Reply-To: <87pmbi5ugn.fsf@localhost>
On 13/01/2023 22:23, Ihor Radchenko wrote:
> Matt writes:
>
>> Would you like me to correct how I've incorporated my changes?
>
> No. I was referring to the initial situation with a single commit being
> displayed.
>
> I am not sure what Max was trying to point out.
Look at the commit message for
https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=4f319088ba5f11d4b6adf808f39f11dfa52c08e4
> Merge branch 'ob-shell-cleanup-tests'
It suggests that this is a merge commit for a local branch. Notice that
the commit has 2 parents:
> committer Matthew Trzcinski 2023-01-11 11:16:53 -0500
> parent 07c63df9c7f40b17acb5c517baa0d321098f31da (diff)
> parent 9ed2821053cf7b0c2f02fe941a54e1d3a9837aeb (diff)
Second one:
https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=9ed2821053cf7b0c2f02fe941a54e1d3a9837aeb
author Matt Trzcinski 2022-12-30 13:03:59 -0500
committer Matt Trzcinski 2022-12-31 13:56:27 -0500
test-ob-shell.el: Organize tests
And changes made by this commit are included into diff shown for the
merge commit 4f319088ba by cgit. E.g. gitk for local repository does not
show any changes for the merge commit.
So Matt did not squashed commits before committing to the main branch
and detailed commit messages are preserved. That is why I do not
consider cgit render as a strong enough reason for reverting.
However I would prefer linear commit history when possible, so I suggest
to do the following in similar cases (not verified, may have typos)
git fetch # get latest commits
git checkout ob-shell-cleanup-tests
git rebase origin/main
git checkout main
git pull
git merge --ff-only ob-shell-cleanup-tests
(Omit --ff-only if it is real merge because the fix is committed to the
bugfix branch.)
It should help to avoid confusion and to make git archeology easier.
next prev parent reply other threads:[~2023-01-14 7:43 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
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 [this message]
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='tptmc2$3vs$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).