From 2934e1a884b7395cc72c0cba705e80de47f5db65 Mon Sep 17 00:00:00 2001 From: giomba Date: Tue, 30 Nov 2021 15:50:45 +0100 Subject: [PATCH] git --- git-pull.txt | 13 ------------- git.md | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 13 deletions(-) delete mode 100644 git-pull.txt diff --git a/git-pull.txt b/git-pull.txt deleted file mode 100644 index e0b2614..0000000 --- a/git-pull.txt +++ /dev/null @@ -1,13 +0,0 @@ -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. - diff --git a/git.md b/git.md index d9dec7d..da71268 100644 --- a/git.md +++ b/git.md @@ -6,3 +6,20 @@ ### Edits of a certain file git diff -- path/file + +### Git pull +``` +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. +``` +