From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Alex Henrie" <alexhenrie24@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Randall S . Becker" <rsbecker@nexbridge.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Denton Liu" <liu.denton@gmail.com>,
"Elijah Newren" <newren@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH 7/7] fast-forward: add help about merge vs. rebase
Date: Wed, 21 Jul 2021 19:08:54 -0500 [thread overview]
Message-ID: <20210722000854.1899129-8-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210722000854.1899129-1-felipe.contreras@gmail.com>
Now that we have a locus for merge versus rebase documentation, we can
refer to it on the diverging advice.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
Documentation/git-fast-forward.txt | 48 ++++++++++++++++++++++++++++++
advice.c | 4 ++-
2 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-fast-forward.txt b/Documentation/git-fast-forward.txt
index 38c920964f..1989fdec4a 100644
--- a/Documentation/git-fast-forward.txt
+++ b/Documentation/git-fast-forward.txt
@@ -50,6 +50,54 @@ synchronize the two branches.
THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOUR MAY CHANGE.
+MERGE OR REBASE
+---------------
+
+The decision to whether merge or rebase depends on the situation and the
+project. Traditionally git has prefered merge over rebase, but that creates a
+new commit, and that's frowned up on some projects, so you can't just simply
+choose to merge blindly.
+
+------------
+ D---C---B---A origin/master
+ \
+ X---Y master
+------------
+
+The nature of distributed version control systems make this divergence
+unavoidable; you must decide how to synchronize this divergence.
+
+Should you choose to merge, the two heads (master and origin/master) will be joined
+together in a new commit:
+
+------------
+ origin/master
+ |
+ v
+ D---C---B---A---M master
+ \ /
+ X---Y---+
+------------
+
+This new commit is called a "merge commit" and has two parents (A and Y).
+
+Rebasing on the other hand rewrites the history:
+
+------------
+ origin/master
+ |
+ v
+ D---C---B---A---X'---Y' master
+------------
+
+The commits that diverged (X and Y) are rewritten as if they were created on top
+of the new base (A). This creates a linear history, which is cleaner, but some
+people prefer to preserve the original hsitory.
+
+In both cases it's likely you would have to resolve conflicts, the difference is
+that in a merge you would have to do it all at once in one commit, while with a
+rebase you would have to do it on every rewritten commit.
+
SEE ALSO
--------
linkgit:git-merge[1], linkgit:git-rebase[1]
diff --git a/advice.c b/advice.c
index 60de7fbc4e..7f422b05d3 100644
--- a/advice.c
+++ b/advice.c
@@ -337,5 +337,7 @@ void diverging_advice(void)
"\n"
"or:\n"
"\n"
- "\tgit rebase\n"));
+ "\tgit rebase\n"
+ "\n"
+ "For more information check \"git help fast-forward\".\n"));
}
--
2.32.0.40.gb9b36f9b52
next prev parent reply other threads:[~2021-07-22 0:09 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-22 0:08 [PATCH 0/7] fast-forward: new command with advice and documentation Felipe Contreras
2021-07-22 0:08 ` [PATCH 1/7] merge: improve fatal fast-forward message Felipe Contreras
2021-07-22 0:08 ` [PATCH 2/7] merge: add diverging advice for novices Felipe Contreras
2021-07-22 0:08 ` [PATCH 3/7] merge: make the diverging advise configurable Felipe Contreras
2021-07-22 0:08 ` [PATCH 4/7] merge: split cmd_merge() Felipe Contreras
2021-07-22 0:08 ` [PATCH 5/7] fast-forward: add new builtin Felipe Contreras
2021-07-22 0:08 ` [PATCH 6/7] doc: fast-forward: explain what it is Felipe Contreras
2021-07-22 0:08 ` Felipe Contreras [this message]
2021-07-22 22:57 ` [PATCH 7/7] fast-forward: add help about merge vs. rebase Philip Oakley
2021-07-23 17:10 ` Felipe Contreras
2021-07-23 19:14 ` Philip Oakley
2021-07-23 20:14 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210722000854.1899129-8-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=liu.denton@gmail.com \
--cc=newren@gmail.com \
--cc=pclouds@gmail.com \
--cc=rsbecker@nexbridge.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).