jangid@alien.topOPBtoEmacs@communick.news•Magit: How do you do "git pull --no-rebase"?English
1·
11 months agoIf Magit is functioning correctly, it shouldn’t error out when both the remote and local repos have been updated post the last sync. Currently, to resolve this, I resort to the CLI and run git pull --no-rebase
, which prompts for a comment and creates a new commit upon saving.
I want exactly this behavior inside Magit. Is there a setting to do that?
I understand that. But we have to choose betweet
--rebase
,--no-rebase
or--ff-only
when git gets stuck.