>>> "KK" == Konstantin Khomoutov <kos...@bswap.ru> writes:
> On Tue, Jul 11, 2023 at 08:20:23PM +0200, Uwe Brauer wrote: >>> Do I assume correctly that you have had that configuration option set in >>> some >>> of the Git configuration sources? >> >> Well I had in my global .gitconfigure file indeed the line >> [pull] >> rebase = true >> >> I forgot it completely, sorry 😨 > Nah, that's a good lesson to me, too: I did think of this possibility but has > decided not to mention it to not compilcate matters :-) > Actually, that's one of the problems with `git pull`: it has too much magic > built in. I for one, am in the camp who thinks that `git pull` should be > taught to new users quite late in their Git curriculum, if at all. A good > rundown of these matters (if a tiny bit old) is [1]. I wholeheartedly agree (in mercurial I always use hg pull & hg merge == git fetch & git merge) However I am running experiments for my students next year, who will use matlab's git interface, for sure they prefer to use pull and not fetch and I have to look for a configuration which is the least confusing for them The open question is what happens if a conflicting commit is pulled (I mean what matlab's interface does about it.) -- 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/87edle19m2.fsf%40mat.ucm.es.
smime.p7s
Description: S/MIME cryptographic signature
