From 22ce038b4b41a85c1e146a7cdca190c82d8eadcd Mon Sep 17 00:00:00 2001 From: giomba Date: Thu, 18 Nov 2021 14:51:48 +0100 Subject: [PATCH] git pull rebase --- git-pull.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 git-pull.txt diff --git a/git-pull.txt b/git-pull.txt new file mode 100644 index 0000000..e0b2614 --- /dev/null +++ b/git-pull.txt @@ -0,0 +1,13 @@ +hint: Pulling without specifying how to reconcile divergent branches is +hint: discouraged. You can squelch this message by running one of the following +hint: commands sometime before your next pull: +hint: +hint: git config pull.rebase false # merge (the default strategy) +hint: git config pull.rebase true # rebase +hint: git config pull.ff only # fast-forward only +hint: +hint: You can replace "git config" with "git config --global" to set a default +hint: preference for all repositories. You can also pass --rebase, --no-rebase, +hint: or --ff-only on the command line to override the configured default per +hint: invocation. +