From: Philip Oakley <philipoakley@iee.email>
To: gitster@pobox.com
Cc: Johannes.Schindelin@gmx.de, alexhenrie24@gmail.com,
git@vger.kernel.org, newren@gmail.com, philipoakley@iee.email,
phillip.wood123@gmail.com, tao@klerks.biz
Subject: [PATCH 1/1] doc: Glossary, describe Flattening
Date: Sat, 13 May 2023 17:56:56 +0100 [thread overview]
Message-ID: <20230513165657.812-1-philipoakley@iee.email> (raw)
In-Reply-To: <xmqq5ybug8s8.fsf@gitster.g>
Clarify the term 'flatten' and the unexpected effects that the user
may come across, such as discussed in [1] and [2].
[1] https://lore.kernel.org/git/xmqqr0ukggk5.fsf@gitster.g/
[2] https://lore.kernel.org/git/xmqq5ybug8s8.fsf@gitster.g/
Signed-off-by: Philip Oakley <philipoakley@iee.email>
---
Documentation/glossary-content.txt | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 5a537268e2..36125e503c 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -173,6 +173,19 @@ current branch integrates with) obviously do not work, as there is no
missing from the local <<def_object_database,object database>>,
and to get them, too. See also linkgit:git-fetch[1].
+[[def_flatten]]flatten::
+ Flattening is a common term for the 'linearizing' of a
+ selected portion of the <<def_commit_graph_general,commit graph>>.
+ Flattening may include excluding commits, or rearranging commits,
+ for the linearized sequence.
+ In particular, linkgit:git-log[1] and linkgit:git-show[1] have a
+ range of "History Simplification" techniques that affect which
+ commits are included, and how they are linearized.
+ The default linkgit:git-rebase[1] will drop merge commits when it
+ flattens history, which also may be unexpected.
+ The two common linearization types are chronological (date-time), and
+ topological (shape) based orderings. Generation numbering is topological.
+
[[def_file_system]]file system::
Linus Torvalds originally designed Git to be a user space file system,
i.e. the infrastructure to hold files and directories. That ensured the
--
2.40.0.windows.1
next prev parent reply other threads:[~2023-05-13 16:57 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-20 3:32 [PATCH 1/2] rebase: add a --rebase-merges=drop option Alex Henrie
2023-02-20 3:32 ` [PATCH 2/2] rebase: add a config option for --rebase-merges Alex Henrie
2023-02-20 9:38 ` Phillip Wood
2023-02-20 17:06 ` Alex Henrie
2023-02-20 16:41 ` Elijah Newren
2023-02-20 9:31 ` [PATCH 1/2] rebase: add a --rebase-merges=drop option Phillip Wood
2023-02-20 17:03 ` Alex Henrie
2023-02-20 21:42 ` Junio C Hamano
2023-02-21 16:08 ` Philip Oakley
2023-02-21 18:42 ` Junio C Hamano
2023-05-13 16:51 ` [PATCH 0/1] cover-letter: flatten Philip Oakley
2023-05-13 16:56 ` Philip Oakley [this message]
2023-05-15 6:59 ` [PATCH 1/1] doc: Glossary, describe Flattening Junio C Hamano
2023-05-27 16:28 ` Philip Oakley
2023-05-19 21:35 ` Kristoffer Haugsbakk
2023-05-27 16:46 ` Philip Oakley
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=20230513165657.812-1-philipoakley@iee.email \
--to=philipoakley@iee.email \
--cc=Johannes.Schindelin@gmx.de \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=tao@klerks.biz \
/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 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).