Differences

This shows you the differences between two versions of the page.

--- programming:git:git [2019/09/27 13:41] – [Clone only one directory] maferreira
+++ programming:git:git [2021/08/02 09:51] – [Clone only one directory] sbolay
@@ Line 8: / Line 8: @@
 Reference : https://git-scm.com/book/en/v2
+===== Git pull =====
+git pull runs git fetch with the given parameters and calls git merge to merge the retrieved branch heads into the current branch
+<note>
+Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+  git config pull.rebase false  # merge (the default strategy)
+  git config pull.rebase true   # rebase
+  git config pull.ff only       # fast-forward only
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per invocation.
+</note>
+  git config --global pull.rebase true
+Reference : https://git-scm.com/docs/git-pull \\
+Exemple : https://dev.to/mliakos/don-t-git-pull-use-git-pull-rebase-instead-5b8k