Re: ob-shell intentions and paperwork (was Bash results broken?)

[Ihor Radchenko]

Max Nikulin <manikulin@gmail.com> writes:

> 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.

Should we then report a bug to cgit mailing list?

> 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.

Sure. Using rebase for merging and pulling is generally a good idea.

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>