From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>,
Alex Henrie <alexhenrie24@gmail.com>,
Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Philip Oakley <philipoakley@iee.email>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v3 01/16] doc: pull: explain what is a fast-forward
Date: Sat, 5 Dec 2020 13:52:58 -0600 [thread overview]
Message-ID: <20201205195313.1557473-2-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20201205195313.1557473-1-felipe.contreras@gmail.com>
We want users to know what is a fast-forward in order to understand the
default warning.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
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
next prev parent reply other threads:[~2020-12-05 19:54 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-05 19:52 [PATCH v3 00/16] pull: default warning improvements Felipe Contreras
2020-12-05 19:52 ` Felipe Contreras [this message]
2020-12-07 20:45 ` [PATCH v3 01/16] doc: pull: explain what is a fast-forward Junio C Hamano
2020-12-07 22:22 ` Felipe Contreras
2020-12-07 22:40 ` Elijah Newren
2020-12-07 23:08 ` Junio C Hamano
2020-12-08 0:20 ` Felipe Contreras
2020-12-08 0:17 ` Felipe Contreras
2020-12-08 1:23 ` Elijah Newren
2020-12-08 14:37 ` Felipe Contreras
2020-12-08 18:55 ` Felipe Contreras
2020-12-05 19:52 ` [PATCH v3 02/16] pull: improve default warning Felipe Contreras
2020-12-07 20:55 ` Junio C Hamano
2020-12-07 22:29 ` Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 03/16] pull: refactor fast-forward check Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 04/16] pull: cleanup autostash check Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 05/16] pull: trivial cleanup Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 06/16] pull: move default warning Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 07/16] pull: display default warning only when non-ff Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 08/16] pull: trivial whitespace style fix Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 09/16] pull: introduce --merge option Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 10/16] pull: show warning with --ff Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 11/16] rebase: add REBASE_DEFAULT Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 12/16] pull: move configurations fetches Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 13/16] pull: add proper error with --ff-only Felipe Contreras
2020-12-05 20:15 ` Felipe Contreras
2020-12-05 20:19 ` [PATCH 1/2] " Felipe Contreras
2020-12-05 20:19 ` [PATCH 2/2] tentative: pull: change the semantics of --ff-only Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 14/16] test: merge-pull-config: trivial cleanup Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 15/16] test: pull-options: revert unnecessary changes Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 16/16] pull: trivial memory fix Felipe Contreras
2020-12-07 20:55 ` [PATCH v3 00/16] pull: default warning improvements Junio C Hamano
2020-12-07 22:33 ` Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201205195313.1557473-2-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.email \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.