git rebase

• git rebase
  • https://git-scm.com/docs/git-rebase

• git config pull.rebase false # merge (the default strategy)
• git config pull.rebase true # rebase

Related

• crane rebase
• Fatal: Need to specify how to reconcile divergent branches.

See also

• git config, .git/config, ~/.gitconfig, --list, --global, Usage: git config, credential.helper, --get, Configure git