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.
