disable auto pull ?

[jbrodriguez]

the last version changed something, now every time i open lazygit, it automatically pulls and merges branches that are not the current one, how do i avoid that ?

a popup came up when i installed this version, i think it referred to this change, however i don't know how to pop it up again

haven't found docs about it in the release notes

can anyone help?

[stefanhaller]

It never merges anything. The only thing that's new is that it auto-fast-forwards your main branches (usually master or main), but only if fast-forwarding is possible. I find this very useful myself, that's why I enabled it by default. You can turn it off with

git:
  autoForwardBranches: none

See #4493.

[jbrodriguez]

hey thanks for the reply !!!

yea, im not sure if that is what's affecting the change in behavior im seeing

previously, i opened lazygit and if a local branch (main/master) was out of sync with the remote, it would show a down arrow, and i would manually pull whenever i needed

this no longer happens, it's seemingly auto pulling main/master

i felt is useful, since it let me know about any new changes on the remote that i should be aware of, now i don't know if i need to update my feat branch from main or not 🤷‍♂️

[stefanhaller]

I understand. That's a very valid reason to disable the behavior: to get a chance to inspect what's new upstream.

I personally don't need this, because I'm working in a very high-traffic monorepo that gets tons of commits all the time from teams I don't even know, so trying to keep track of all that just doesn't make sense. I can see how it may be desirable in repos with less traffic though.

now i don't know if i need to update my feat branch from main or not

For this, I find lazygit's "divergence from base branch" feature more useful than the yellow arrows on the main branch itself. It's off by default, but if you enable

gui:
  showDivergenceFromBaseBranch: arrowAndNumber

then you will see an extra blue arrow on every feature branch that shows how far this particular branch has fallen behind main. You can then press u b on such a branch to see the commits from main that this branch doesn't contain yet.

[jbrodriguez]

For this, I find lazygit's "divergence from base branch"

ah, that's interesting! i wasn't aware of it, ill try it out and see how it goes

thanks for the support and the info ! 👍