Re: [PATCH v2 01/14] doc: pull: explain what is a fast-forward
flat view
From: Elijah Newren <hidden>
Date: 2020-12-04 22:56:07
On Thu, Dec 3, 2020 at 10:16 PM Felipe Contreras [off-list ref] wrote:
quoted hunk ↗ jump to hunk
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..dc812139f4 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-foward way up to the new master. + +------------ + D---E---A---B---C master, origin/master +------------ + +However, a non-fast-foward case looks very different. + ------------ A---B---C master on origin / --2.29.2
Makes sense to me.