From: Felipe Contreras <felipe.contreras@gmail.com>
To: Philip Oakley <philipoakley@iee.email>,
Felipe Contreras <felipe.contreras@gmail.com>,
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>
Subject: Re: [PATCH 7/7] fast-forward: add help about merge vs. rebase
Date: Fri, 23 Jul 2021 12:10:46 -0500 [thread overview]
Message-ID: <60faf81658201_defb208d4@natae.notmuch> (raw)
In-Reply-To: <76d59e73-ae5d-3bef-4aa3-5d1af9611577@iee.email>
Philip Oakley wrote:
> minor nit/query on format..
> On 22/07/2021 01:08, Felipe Contreras wrote:
> > 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
>
> .. here, in my email reader, the arrow doesn't align to the commit
> because of the single char (+) indent relative to tab spacing. Does this
> cause any problems when formatted in the html/web style?
No, it looks fine.
I don't have a problem with tabs or spaces, but git-pull.txt uses tabs.
> It is good to have diagrams for the visual learners!
Actually, it seems there's no such thing as "visual learners" [1]; we
are all visual learners.
Cheers.
> > + D---C---B---A---M master
> > + \ /
> > + X---Y---+
> > +------------
[1] https://www.theatlantic.com/science/archive/2018/04/the-myth-of-learning-styles/557687/
--
Felipe Contreras
next prev parent reply other threads:[~2021-07-23 17:10 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 ` [PATCH 7/7] fast-forward: add help about merge vs. rebase Felipe Contreras
2021-07-22 22:57 ` Philip Oakley
2021-07-23 17:10 ` Felipe Contreras [this message]
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=60faf81658201_defb208d4@natae.notmuch \
--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=philipoakley@iee.email \
--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).