[PATCH v4 01/19] doc: pull: explain what is a fast-forward
From: Felipe Contreras <hidden>
Date: 2020-12-08 00:27:34
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
We want users to know what is a fast-forward in order to understand the default warning. Signed-off-by: Felipe Contreras <redacted> --- Documentation/git-pull.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 5c3fb67c01..e1605a81b3 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt@@ -38,6 +38,20 @@ as set by linkgit:git-branch[1] `--track`. Assume the following history exists and the current branch is "`master`": +------------ + A---B---C master on origin + / + D---E master +------------ + +Then `git pull` will merge in a fast-forward way up to the new master. + +------------ + D---E---A---B---C master, origin/master +------------ + +However, a non-fast-forward case looks very different. + ------------ A---B---C master on origin /
--
2.29.2