From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01F35C433ED for ; Sat, 3 Apr 2021 05:16:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BC43E610CB for ; Sat, 3 Apr 2021 05:16:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232159AbhDCFQt (ORCPT ); Sat, 3 Apr 2021 01:16:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230000AbhDCFQs (ORCPT ); Sat, 3 Apr 2021 01:16:48 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1065C0613E6 for ; Fri, 2 Apr 2021 22:16:44 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id x7-20020a17090a2b07b02900c0ea793940so5445837pjc.2 for ; Fri, 02 Apr 2021 22:16:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language; bh=s/VFZt3JIlR0dcB20Fo5Fle5f06DOq18lcyO9TU+WM4=; b=Gi6MunlZrItPTWXJGFp6bWqPZDsUP5BI4fByunQD6OqGy+4dS3nO8h/iTDS7EzHsR0 luv2EJ3yPk7B3n6bWOqYWUWcuQJwjqmm2jYSa3eb1edbpW+V284B5OuNKNtYKmjrraSV bczUm1wqobeDen0vvCnDs8N7WRtV036F2TaHqYGk8r4Kf3ZY7cqgji4IsHoXcB0djgVQ i21GQGXUaDI7IKHJDTP6/koWyPJfnwJMoh5fWxuVBChufRESR7xDGUSgM6iLhL/RQAsD Y+Fv5nwTLwDCA2KWNlDrmRUNZ8j6C13u6v8Ounf2H+zWRbLwqKX+yVXNcNO0sZ6Uz6Ln 7Xxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=s/VFZt3JIlR0dcB20Fo5Fle5f06DOq18lcyO9TU+WM4=; b=N5378US040QgWiVz1rlWie2rlk2JCCYqzcBxPVwhYuuiOU93OfysWfk63ZysfVZqhw Ajc+lJqE2fbZ1akD0lZXJ+Mfbr0bGHvMTsI+2j4LKdmb9MoC4cZcL6+ok1CiffQrdNrD 2m0l2GApkBnsD3vk8QWiQ07V7SiTDojNBjwT4GyBXihFMjMzeLaR6fvd239UVb+eCluF YE1qXMumXngr1oMOegsL67h74SZV9XcvOt1ShFZOYfq1O9hJJondAi1x44PdkyjzuDvY 0Sv9Dl/ZRC6PlhlCjUxis7CaG16n9NklM+wK6hO08E7yk12RBvy1ics0WvLcteMxOCmi m4Rw== X-Gm-Message-State: AOAM530DxtRbmaasOglVsWhBXK/ZA46raMjgUzyL/A9/jqnNw/Cweo9f vqy4vulnJeuy69M6Get1u/MH/5LaNZBVhQ== X-Google-Smtp-Source: ABdhPJz91pVr2YT9y+CmF72D4DhL1Yu95VCOOIEXgZxBZefHZG07EuVa6bpqc/lYby5O3TM4xotplQ== X-Received: by 2002:a17:90b:4aca:: with SMTP id mh10mr16201855pjb.185.1617427004414; Fri, 02 Apr 2021 22:16:44 -0700 (PDT) Received: from [192.168.43.80] (subs32-116-206-28-50.three.co.id. [116.206.28.50]) by smtp.gmail.com with ESMTPSA id i4sm9873559pfo.14.2021.04.02.22.16.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 02 Apr 2021 22:16:44 -0700 (PDT) Subject: Re: [PATCH][GSoC] user-manual.txt: fix empty heading of introduction To: Junio C Hamano , Firmin Martin Cc: git@vger.kernel.org References: <20210402121303.344914-1-firminmartin24@gmail.com> From: Bagas Sanjaya Message-ID: <7530f132-cd72-bb6f-21f1-1ee23ca5e20f@gmail.com> Date: Sat, 3 Apr 2021 12:16:40 +0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------12A88B567543E19DC53F339E" Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This is a multi-part message in MIME format. --------------12A88B567543E19DC53F339E Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 03/04/21 04.22, Junio C Hamano wrote: > I would have expected to see "before and after". Is it too obvious > what the postimage would be? Otherwise, a better presentation would > be to show (an excerpt from) diff between preimage and postimage > output. > > Thanks. > Attached is `diff -u` of generated HTML output, before and after this patch. The HTML is generated using Asciidoctor. It seems like from the output, this patch actually add missing header for intro chapter (in line with title of this patch). Anyway, thanks. Reviewed-by: Bagas Sanjaya -- An old man doll... just what I always wanted! - Clara --------------12A88B567543E19DC53F339E Content-Type: text/x-patch; charset=UTF-8; name="before-after.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="before-after.diff" --- user-manual.html 2021-04-03 11:58:44.937710623 +0700 +++ user-manual.patched.html 2021-04-03 12:01:01.634421455 +0700 @@ -1,17 +1,17 @@ -Git User Manual

<= a name=3D"id-1">Git User Manual

Table of Contents

1. Repositories and Branches<= /span>
How to get a Git repository
How to check out a different v= ersion of a project
Understanding History: Commits
Understanding history: commits, parents, and reachability
Understanding = history: History diagrams
Understanding history: What is a branch?
Manipulating branches
Examining an old version without creating a n= ew branch
Examining branches from a remote repository=
N= aming branches, tags, and other references
Updating a=20 repository with git fetch
Fetching branches from other repositories<= /span>
2. Exploring Git history
How to use bisect to find a regre= ssion
Naming commits
Creating tags
= Browsing revisions
Generating diffs
Viewing old file versions
= Examples
Counting the n= umber of commits on a branch
<= a href=3D"#checking-for-equal-branches">Check whether two branches point = at the same history
Find first tagged version including a given=20 fix
Showing commits unique to a given branch=
Creating a=20 changelog and tarball for a software release
Finding co= mmits referencing a file with given content
3. Dev= eloping with Git
Telling Git your name
Creating a n= ew repository
How to make a commit
Creating good commit = messages
Ignoring files
How to merge
<= a href=3D"#resolving-a-merge">Resolving a merge
Getting confli= ct-resolution help during a merge
Undoing a merge
Fast-forward merg= es
Fixing mistakes
Fixing a mistake with a new commit=
Fixing a mistake by rewriting history
Checking out an old versi= on of a file
Temporarily setting aside work in progress
Ensuring good performance
Ensuring reliability
Checki= ng the repository for corruption
Recovering lost changes
4. Sharing development with others
<= dt>Get= ting updates with git pull
Submitting patches to a project
Importing p= atches to a project
Public Git repositories
Sett= ing up a public repository
Exporting a Git repository via the Git protoc= ol
Exporting a git repository via HTTP
Pushing cha= nges to a public repository
What to do when a push fails
Setting=20 up a shared repository
Allowing web browsing of a repository<= /dt>
How to get a Git repository with minimal h= istory
Examples
Maintaining topic branches = for a Linux subsystem maintainer
<= span class=3D"chapter">5. Rewriting hist= ory and maintaining patch series
Creating the perfect patch series=
Kee= ping a patch series up to date using git rebase
Rewriting a single co= mmit
Reordering or selecting from a patch series
Using interacti= ve rebases
Other tools
Problems with rewriting history
Why = bisecting merge commits can be harder than bisecting linear history
6. Advanced branch management
<= span class=3D"section">Fetching=20 individual branches
git fetch and fast-forwards
Forcing git fetch to do n= on-fast-forward updates
Configuring remote-tracking branches
7. Git concepts
<= a href=3D"#the-object-database">The Object Database
Commit Object
Tree Ob= ject
= Blob Object
Trust
Tag Object
How Git stores objects efficiently: pack files
<= span class=3D"section">Dangling objects=
Recovering from repository corruption
The index<= /span>
= 8. Submodules
Pitfalls with submodules
=
9. Low= -level Git operations
= Object access and manipulation
The Workflow<= /a>
working directory =E2=86=92 index
index =E2=86=92=20 object database
object database =E2=86=92 index
index =E2= =86=92 working directory
Tying it all together
<= /dd>
Examining=20 the data
Merging multiple trees
Merging multiple trees, con= tinued
10. Hacking Git
Object storage format
A bird= s-eye view of Git=E2=80=99s source code
11. Git Glossary
Git expla= ined
A. Git Quick Reference
Creating a n= ew repository
Managing branches
Exploring history
Making changes
Merging
Shari= ng your changes
Repository maintenance
B. Notes and todo list for th= is manual
Todo list
+Git User Manual

<= a name=3D"id-1">Git User Manual

Table of Contents

1. Introduction
2. Repositor= ies and Branches
How to get a Git repository
How to ch= eck out a different version of a project
Understanding History: Commi= ts
Understanding history: commits, parents, and reachab= ility
Understanding history: History diagrams
Understanding history: What=20 is a branch?
Manipulating branches
Examining an old version w= ithout creating a new branch
<= a href=3D"#examining-remote-branches">Examining branches from a remote re= pository
Naming branches, tags, and other references<= /dt>
Updating a repository with git fetch
Fetching branches from oth= er repositories
3. Exploring Git history
How to use bi= sect to find a regression
Naming commits
Creating tags
Browsing revisions
Ge= nerating diffs
Viewing old file versions
Examples
Counting the number of commits on a branch
Check whether = two branches point at the same history
Find first tagged versio= n including a given fix
Showing commits unique to a giv= en branch
Creating a changelog and tarball for a software release
Finding commits referencing a file with given content
4. Developing with Git
Telling Git your name<= /a>
Creating a new repository
How to make a commit
= Creating good commit messages
= Ignoring files
How to merge
Resolving a merge
Getting conflict-resolution help during a merge
<= /dl>
Undoing=20 a merge
Fast-forward merges
Fixing mistakes
Fixing a mistake with a=20 new commit
Fixing a mistake by rewriting history=
Che= cking out an old version of a file
Temporarily setting aside work in prog= ress
Ensuring good performance
Ensuring reliabilit= y
Checking the repository for corruption
Recovering=20 lost changes
5. Sharing development with others
Getting updates with git pull
Submitting patches to a=20 project
Importing patches to a project
Public Git repositories
Setting up a public repository
Exporting a Git repositor= y via the Git protocol
Exporting a git repository via HTTP
Pushing changes to a public repository
What to do when a push fails<= /a>
Setting up a shared repository
Allowing web browsing of a = repository
How to get a Git repo= sitory with minimal history
Examples
Maintai= ning topic branches for a Linux subsystem maintainer
=
6. Rewriting history and maintaining patch series
<= dl>
Creating the per= fect patch series
Keeping a patch series up to date using git rebase<= /span>
= Rewriting a single commit
Reordering or selecting from a patch ser= ies
Using interactive rebases
Other tools
Problems wit= h rewriting history
Why bisecting merge commits can be harder than bisecting=20 linear history
7. Advanced branch management
Fetching individual branches
git fetch and fast-forwards
Forci= ng git fetch to do non-fast-forward updates
Configuring remote= -tracking branches
<= a href=3D"#git-concepts">8. Git concepts
The Object Database
Commit Object
Tree Object
Blob Object
Trust
Tag Object
How Git stores objects efficiently: pack files
D= angling objects
Recovering from repository corruptio= n
The index
9. Submodules
Pitfalls with submodules<= /a>
10. Low-level Git operations
Object access and m= anipulation
The Workflow
<= a href=3D"#working-directory-to-index">working directory =E2=86=92 index<= /a>
index =E2=86=92 object database
object database =E2=86=92=20 index
index =E2=86=92 working directory
Tying it all toget= her
Examining the data
Merging multiple trees
M= erging multiple trees, continued
11. Hacking Git
=
Object storag= e format
A birds-eye view of Git=E2=80=99s source code
12. G= it Glossary
Git explained
A. Git Quick Reference=
Creating a new repository
Managing branches
=
Exploring hist= ory
Making changes
Merging
Sharing your changes
Repository maintenance<= /span>
B. No= tes and todo list for this manual
Todo list
=
=20 -

+

Chapter=C2=A01.=C2=A0Introduction

=
=20

Git is a fast distributed revision control system.

This manual is designed to be readable by someone with basic UNIX command-line skills, but no previous knowledge of Git.

-

Chapter=C2=A01, Repositories=20 and Branches and Chapter=C2=A02, Exploring Git history explain how +

Chapter=C2=A02, Repositories=20 and Branches and Chapter=C2=A03, Exploring Git history explain how to fetch and study a project using git=E2=80=94=E2=80=8Bread these chapt= ers to learn how to build and test a particular version of a software project, search for= regressions, and so on.

People needing to do actual development will also want to read -Chapter=C2=A03, Developing with Git=20 and Chapter=C2=A04, Sharing devel= opment with others.

+Chapter=C2=A04, Developing with Git=20 and Chapter=C2=A05, Sharing devel= opment with others.

Further chapters cover more specialized topics.

Comprehensive reference documentation is available through the man pages, or git-= help(1) command. For example, for the command @@ -26,7 +26,7 @@

Finally, see Appendix=C2=A0B, Notes an= d todo list for this manual for ways that you can help make this = manual more complete.

-

Chapter=C2=A01.=C2=A0Repo= sitories and Branches

Tabl= e of Contents

How to get a Git repository=
How to che= ck out a different version of a project
Understanding History: Commi= ts
Understanding history: commits, parents, and reachab= ility
Understanding history: History diagrams
Understanding history: What=20 is a branch?
Manipulating branches
Examining an old version w= ithout creating a new branch
<= a href=3D"#examining-remote-branches">Examining branches from a remote re= pository
Naming branches, tags, and other references<= /dt>
Updating a repository with git fetch
Fetching branches from oth= er repositories
+

Chapter=C2=A02.=C2=A0Repo= sitories and Branches

Tabl= e of Contents

How to get a Git repository=
How to che= ck out a different version of a project
Understanding History: Commi= ts
Understanding history: commits, parents, and reachab= ility
Understanding history: History diagrams
Understanding history: What=20 is a branch?
Manipulating branches
Examining an old version w= ithout creating a new branch
<= a href=3D"#examining-remote-branches">Examining branches from a remote re= pository
Naming branches, tags, and other references<= /dt>
Updating a repository with git fetch
Fetching branches from oth= er repositories
=20

H= ow to get a Git repository

=20 @@ -139,7 +139,7 @@ has that commit at all). Since the object name is computed as a hash ov= er the contents of the commit, you are guaranteed that the commit can never cha= nge without its name also changing.

-

In fact, in Chapter=C2=A07, Git concepts we sh= all see that everything stored in Git +

In fact, in Chapter=C2=A08, Git concepts we sh= all see that everything stored in Git history, including file data and directory contents, is stored in an obj= ect with a name that is a hash of its contents.

Understanding history: c= ommits, parents, and reachability

@@ -351,7 +351,7 @@ git-config(1= ) for details.)

-

Chapter=C2=A02.=C2=A0Explorin= g Git history

Table of Con= tents

How to use bisect to find a regression
Naming commits
Creating tag= s
Browsing revisions
Generating diffs
Viewing old file version= s
Examples
Counting the number of commits on a branch=
Check whether two branches point at the same history
Find first tagged version including a given fix
Showi= ng commits unique to a given branch
Creating a changelog and tarball for = a software release
Finding commits referencing a file w= ith given content
+

Chapter=C2=A03.=C2=A0Explorin= g Git history

Table of Con= tents

How to use bisect to find a regression
Naming commits
Creating tag= s
Browsing revisions
Generating diffs
Viewing old file version= s
Examples
Counting the number of commits on a branch=
Check whether two branches point at the same history
Find first tagged version including a given fix
Showi= ng commits unique to a given branch
Creating a changelog and tarball for = a software release
Finding commits referencing a file w= ith given content
=20

Git is best thought of as a tool for storing the history of a collection of files. It does this by storing compressed snapshots of @@ -679,7 +679,7 @@

-

Chapter=C2=A03.=C2=A0Developing=20 with Git

Table of Contents=

Telling Git your name
Creating a new repository<= /a>
How to make a commit
Creating good commit messages
Ignorin= g files
How to merge
Resolving a merge
Getting conflict-resolutio= n help during a merge
Undoing a merge
Fast-forward merges
Fixing mis= takes
Fixing a mistake with a new commit
F= ixing a mistake by rewriting history
Checking out an old version of a fil= e
Temporarily setting aside work in progress
Ensuring = good performance
Ensuring reliability
Checking the rep= ository for corruption
Recovering lost changes
+

Chapter=C2=A04.=C2=A0Developing=20 with Git

Table of Contents=

Telling Git your name
Creating a new repository<= /a>
How to make a commit
Creating good commit messages
Ignorin= g files
How to merge
Resolving a merge
Getting conflict-resolutio= n help during a merge
Undoing a merge
Fast-forward merges
Fixing mis= takes
Fixing a mistake with a new commit
F= ixing a mistake by rewriting history
Checking out an old version of a fil= e
Temporarily setting aside work in progress
Ensuring = good performance
Ensuring reliability
Checking the rep= ository for corruption
Recovering lost changes
=20

Telling=20 Git your name

=20 @@ -1023,7 +1023,7 @@ that case.

It is also possible to replace commits further back in the history, b= ut this is an advanced topic to be left for -another chapter= =2E

+another chapter= =2E

Checking out an old version of a f= ile

=20 @@ -1155,7 +1155,7 @@
-

Chapter=C2=A04.=C2=A0Sharing de= velopment with others

Tabl= e of Contents

Getting updates with git pull
Subm= itting patches to a project
Importing patches to a project
Public Git = repositories
Setting up a public repository
Exporti= ng a Git repository via the Git protocol
Exporting a git repository via = HTTP
Pushing changes to a public repository
What to do = when a push fails
Setting up a shared repository=
Allowing = web browsing of a repository
Ho= w to get a Git repository with minimal history
Examples
Maintaining topic branches for a Linux subsystem maintainer<= /a>
+

Chapter=C2=A05.=C2=A0Sharing de= velopment with others

Tabl= e of Contents

Getting updates with git pull
Subm= itting patches to a project
Importing patches to a project
Public Git = repositories
Setting up a public repository
Exporti= ng a Git repository via the Git protocol
Exporting a git repository via = HTTP
Pushing changes to a public repository
What to do = when a push fails
Setting up a shared repository=
Allowing = web browsing of a repository
Ho= w to get a Git repository with minimal history
Examples
Maintaining topic branches for a Linux subsystem maintainer<= /a>
=20
=20 @@ -1492,7 +1492,7 @@ and can be updated using git-fetch(1); you can track other public trees using git-remote(1) to set up a "remote" and git-fetch(1)<= /a> to keep them up to date; see -Chapter=C2=A01, Repositories and=20 Branches.

+Chapter=C2=A02, Repositories and=20 Branches.

Now create the branches in which you are going to work; these start o= ut at the current tip of origin/master branch, and should be set up (using the --track option to git-branch(1)) to merge chan= ges in from @@ -1679,7 +1679,7 @@

-

Chapter=C2=A05.=C2=A0Rewriting = history and maintaining patch series

Table of Contents

Creating the perfect patch series<= /span>
Keep= ing a patch series up to date using git rebase
Rewriting a single com= mit
Reordering or selecting from a patch series
Using interactiv= e rebases
Other tools
Problems with rewriting history
Why b= isecting merge commits can be harder than bisecting linear history
+

Chapter=C2=A06.=C2=A0Rewriting = history and maintaining patch series

Table of Contents

Creating the perfect patch series<= /span>
Keep= ing a patch series up to date using git rebase
Rewriting a single com= mit
Reordering or selecting from a patch series
Using interactiv= e rebases
Other tools
Problems with rewriting history
Why b= isecting merge commits can be harder than bisecting linear history
=20

Normally commits are only added to a project, never taken away or replaced. Git is designed with this assumption, and violating it will @@ -1923,7 +1923,7 @@ publishing.

-

Chapter=C2=A06.=C2=A0Adv= anced branch management

Ta= ble of Contents

Fetching individual branches
git=20 fetch and fast-forwards
Forcing git fetch to do non-fast-forward updates=
Configuring remote-tracking branches
+

Chapter=C2=A07.=C2=A0Adv= anced branch management

Ta= ble of Contents

Fetching individual branches
git=20 fetch and fast-forwards
Forcing git fetch to do non-fast-forward updates=
Configuring remote-tracking branches
=20

= Fetching individual branches

=20 @@ -2012,7 +2012,7 @@ the refspec syntax.

-

Chapter=C2=A07.=C2=A0Git concepts

=

Table of Contents

The Object Database
<= a href=3D"#commit-object">Commit Object
Tree Object
Blob Object
= Trust
Tag Object
<= span class=3D"section">How Git stores objects eff= iciently: pack files
Dangling objects
Recovering from=20 repository corruption
The index
+

Chapter=C2=A08.=C2=A0Git concepts

=

Table of Contents

The Object Database
<= a href=3D"#commit-object">Commit Object
Tree Object
Blob Object
= Trust
Tag Object
<= span class=3D"section">How Git stores objects eff= iciently: pack files
Dangling objects
Recovering from=20 repository corruption
The index
=20

Git is built on a small number of simple but powerful ideas. While i= t is possible to get things done without understanding them, you will find= @@ -2141,7 +2141,7 @@ between two related tree objects, since it can ignore any entries with identical object names.

(Note: in the presence of submodules, trees may also have commits as -entries. See Chapter=C2=A08, Submodules for document= ation.)

+entries. See Chapter=C2=A09, Submodules for document= ation.)

Note that the files all have mode 644 or 755: Git actually only pays attention to the executable bit.

@@ -2258,7 +2258,7 @@ objects. They are not a problem.

The most common cause of dangling objects is that you=E2=80=99ve reba= sed a branch, or you have pulled from somebody else who rebased a branch=E2=80= =94=E2=80=8Bsee -Chapter=C2=A05, = Rewriting history and maintaining patch series. In that case, th= e old head of the original +Chapter=C2=A06, = Rewriting history and maintaining patch series. In that case, th= e old head of the original branch still exists, as does everything it pointed to. The branch pointer itself just doesn=E2=80=99t, since you replaced it with another = one.

There are also other situations that cause dangling objects. For @@ -2437,7 +2437,7 @@ information as long as you have the name of the tree that it described.<= /p>

-

Chapter=C2=A08.=C2=A0Submodules

Table of Contents

Pitfalls with submodules
+

Chapter=C2=A09.=C2=A0Submodules

Table of Contents

Pitfalls with submodules
=20

Large projects are often composed of smaller, self-contained modules.=20 For example, an embedded Linux distribution=E2=80=99s source tree would incl= ude every @@ -2629,7 +2629,7 @@ warning about not being able switch from a dirty branch.

-

Chapter=C2=A09.=C2=A0Low-level=20 Git operations

Table of Co= ntents

Object access and manipulation
The Workflow
working directory =E2=86=92 index
index =E2=86=92 object dat= abase
object database =E2=86=92 index
index =E2=86=92 w= orking directory
Tying it all together
= Examining the dat= a
Merging multiple trees
Merging multiple trees, continued<= /a>
+

Chapter=C2=A010.=C2=A0Low-leve= l Git operations

Table of = Contents

Object access and manipulation
<= span class=3D"section">The Workflow<= /dt>
working directory =E2=86=92 index
index =E2=86=92 object da= tabase
object database =E2=86=92 index
index =E2=86=92 = working directory
Tying it all together
Examining the da= ta
Merging multiple trees
Merging multiple trees, continued=
=20

Many of the higher-level commands were originally implemented as shel= l scripts using a smaller core of low-level Git commands. These can still= @@ -2891,7 +2891,7 @@

and that is what higher level git merge -s re= solve is implemented with.

-

Chapter=C2=A010.=C2=A0Hacking Git

<= /div>

Table of Contents

Objec= t storage format
A birds-eye view of Git=E2=80=99s source code=
+

Chapter=C2=A011.=C2=A0Hacking Git

<= /div>

Table of Contents

Objec= t storage format
A birds-eye view of Git=E2=80=99s source code=
=20

This chapter covers internal details of the Git implementation which probably only Git developers need to understand.

@@ -3072,7 +3072,7 @@ itself!

-

Chapter=C2=A011.=C2=A0Git Glossary

Table of Contents

Git expl= ained
+

Chapter=C2=A012.=C2=A0Git Glossary

Table of Contents

Git expl= ained
=20

Git explained

=20 --------------12A88B567543E19DC53F339E--