Re: [PATCH v4 1/2] doc: remove gittutorial
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 30, 2026, 22:27 UTC
- Message-ID
- <xmqq8q3evn6j.fsf@gitster.g>
- In-Reply-To
- <9e07da3c-0e75-41d2-8769-1347b3827ba6@app.fastmail.com>
"Julia Evans" <julia@jvns.ca> writes:
Show 7 quoted lines
> I tried to fix this, but there are quite a few references to the tutorial > (including in `git.adoc`) and removing all of them would > cause some merge conflicts which I believe would cause more > work for you. I can remove them if you think that's best though. > >> Having said all that, it seems to me that this version is now in a >> pretty good shape to be merged to 'next'?
Indeed, this approach quickly becomes unwieldy. For reference, this is what the change for [1/2] looks like, whose revert must go into [2/2]. Alternatively, once the final contents are mostly settled, we could squash [1/2] and [2/2] into a single commit, which would also ensure that every step in the series builds cleanly ;-).
Looking at your latest message, it seems we are rapidly reaching the point of diminishing returns.
commit dec52253b94b4e39e35ed1b3318f0ea1d867c807 Author: Junio C Hamano <gitster@pobox.com> Date: Fri Oct 30 14:34:20 2026 -0700
fixup! doc: remove gittutorial
diff --git a/Documentation/Makefile b/Documentation/Makefile index f8dea4b395..b7caca088b 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -64,7 +64,7 @@ MAN7_TXT += gitremote-helpers.adoc MAN7_TXT += gitrevisions.adoc MAN7_TXT += gitsubmodules.adoc MAN7_TXT += gittutorial-2.adoc -MAN7_TXT += gittutorial.adoc +# MAN7_TXT += gittutorial.adoc MAN7_TXT += gitworkflows.adoc HOWTO_TXT += $(wildcard howto/*.adoc) diff --git a/Documentation/git.adoc b/Documentation/git.adoc index 6b164c02b0..f93e592b4f 100644 --- a/Documentation/git.adoc +++ b/Documentation/git.adoc @@ -1208,7 +1208,7 @@ the Git Security mailing list <git-security@googlegroups.com>. SEE ALSO -------- -linkgit:gittutorial[7], linkgit:gittutorial-2[7], +linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitdatamodel[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], diff --git a/Documentation/gitcore-tutorial.adoc b/Documentation/gitcore-tutorial.adoc index 71fda63a1c..dd0f0572c1 100644 --- a/Documentation/gitcore-tutorial.adoc +++ b/Documentation/gitcore-tutorial.adoc @@ -12,7 +12,7 @@ This tutorial explains how to use the "core" Git commands to set up and work with a Git repository. If you just need to use Git as a revision control system you may prefer -to start with "A Tutorial Introduction to Git" (linkgit:gittutorial[7]) or +to start with link:user-manual.html[the Git User Manual]. However, an understanding of these low-level tools can be helpful if @@ -1644,7 +1644,6 @@ to follow, not easier. SEE ALSO -------- -linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:git-help[1], diff --git a/Documentation/gitcvs-migration.adoc b/Documentation/gitcvs-migration.adoc index 905d08cd5f..ff68bc1e23 100644 --- a/Documentation/gitcvs-migration.adoc +++ b/Documentation/gitcvs-migration.adoc @@ -20,7 +20,6 @@ designating a single shared repository which people can synchronize with; this document explains how to do that. Some basic familiarity with Git is required. Having gone through -linkgit:gittutorial[7] and linkgit:gitglossary[7] should be sufficient. Developing against a shared repository @@ -81,8 +80,8 @@ Setting Up a Shared Repository ------------------------------ We assume you have already created a Git repository for your project, -possibly created from scratch or from a tarball (see -linkgit:gittutorial[7]), or imported from an already existing CVS +possibly created from scratch or from a tarball, +or imported from an already existing CVS repository (see the next section). Assume your existing repo is at /home/alice/myproject. Create a new "bare" @@ -193,7 +192,6 @@ repositories without the need for a central maintainer. SEE ALSO -------- -linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcore-tutorial[7], linkgit:gitglossary[7], diff --git a/Documentation/gitglossary.adoc b/Documentation/gitglossary.adoc index eb1e60832e..e44384fe64 100644 --- a/Documentation/gitglossary.adoc +++ b/Documentation/gitglossary.adoc @@ -13,7 +13,6 @@ include::glossary-content.adoc[] SEE ALSO -------- linkgit:gitdatamodel[7], -linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], diff --git a/Documentation/gittutorial-2.adoc b/Documentation/gittutorial-2.adoc index 6a4d482ed6..6244039b04 100644 --- a/Documentation/gittutorial-2.adoc +++ b/Documentation/gittutorial-2.adoc @@ -8,8 +8,6 @@ gittutorial-2 - A tutorial introduction to Git: part two DESCRIPTION ----------- -You should work through linkgit:gittutorial[7] before reading this tutorial. - The goal of this tutorial is to introduce two fundamental pieces of Git's architecture--the object database and the index file--and to provide the reader with everything necessary to understand the rest @@ -418,7 +416,6 @@ example, creating a new commit. SEE ALSO -------- -linkgit:gittutorial[7], linkgit:gitcvs-migration[7], linkgit:gitcore-tutorial[7], linkgit:gitglossary[7], diff --git a/Documentation/gitworkflows.adoc b/Documentation/gitworkflows.adoc index 49291fe3c7..edeb5959ef 100644 --- a/Documentation/gitworkflows.adoc +++ b/Documentation/gitworkflows.adoc @@ -461,7 +461,6 @@ other options. SEE ALSO -------- -linkgit:gittutorial[7], linkgit:git-push[1], linkgit:git-pull[1], linkgit:git-merge[1], diff --git a/Documentation/meson.build b/Documentation/meson.build index cfa9c67609..4302c7e854 100644 --- a/Documentation/meson.build +++ b/Documentation/meson.build @@ -207,7 +207,7 @@ manpages = { 'gitrevisions.adoc' : 7, 'gitsubmodules.adoc' : 7, 'gittutorial-2.adoc' : 7, - 'gittutorial.adoc' : 7, +# 'gittutorial.adoc' : 7, 'gitworkflows.adoc' : 7, } diff --git a/command-list.txt b/command-list.txt index 63ae2a67c9..559b943d68 100644 --- a/command-list.txt +++ b/command-list.txt @@ -243,7 +243,7 @@ gitremote-helpers guide gitrepository-layout userinterfaces gitrevisions userinterfaces gitsubmodules guide -gittutorial guide +# gittutorial guide gittutorial-2 guide gitweb ancillaryinterrogators gitworkflows guide