> from https://git-scm.com/docs/git-config > pull.ff
> By default, Git does not create an extra merge commit when merging a
> commit that is a descendant of the current commit. Instead, the tip
> of the current branch is fast-forwarded. When set to |false|, this
> variable tells Git to create an extra merge commit in such a case
> (equivalent to giving the |--no-ff| option from the command line).
> When set to |only|, only such fast-forward merges are allowed
> (equivalent to giving the |--ff-only| option from the command line).
> This setting overrides |merge.ff| when pulling.
> if you run git config pull.ff false a git pull will always default to a
> merge commit. Use git config --global to set system wide
It did not help, but the message says
Unpacking objects: 100% (3/3), 315 bytes | 157.00 KiB/s, done.
>From
>/home/oub/Mail/Remember/HG-Git/Resolve-Editing-Conflicts-coauthor/Git-fetch-vs-pull/Git-pull-no-ff/Uwe/../Server
f18fb04..a709953 default -> origin/default
Successfully rebased and updated refs/heads/default.
I just realized also
[pull]
rebase = true
So I will set this to false and see what happens
that was the culprit.
Thanks all of your for your patience. Should have checked by
configuration first 😳
Regards
> On 7/10/23 12:01, Uwe Brauer wrote:
--
Warning: Content may be disturbing to some audiences
I strongly condemn Putin's war of aggression against the Ukraine.
I support to deliver weapons to Ukraine's military.
I support the NATO membership of the Ukraine.
I support the EU membership of the Ukraine.
https://addons.thunderbird.net/en-US/thunderbird/addon/gmail-conversation-view/
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/git-users/871qhf4kb3.fsf%40mat.ucm.es.
smime.p7s
Description: S/MIME cryptographic signature
