Re: [DRAFT] Branching and merging with git

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: J. Bruce Fields
Date: Friday, November 17, 2006 - 11:21 am

On Fri, Nov 17, 2006 at 10:32:46AM -0500, Theodore Tso wrote:

Yeah, the really difficult problem here is figuring out how to organize
the documentation.  There are a few needs:

	1. Quick-start/task-based documentation
		- We want to "sell" git to the beginning user by getting
		  them up and running as quickly as possible.
		- We need to help people with some limited needs--
		  testers who just need to download the latest linux git
		  tree, or bisect, or whatever.
		- It's also a fun way to demonstrate the richness of
		  some git features (e.g. history explanation).
	2. Conceptual background
		- People need to understand the commit graph, branches,
		  merging, the index file (gack), pack files, etc.--some of
		  that can be put off a little while, some of it can't.
	3. Reference documentation

The man pages do most of #3, but maybe they could be better organized--I
think people aren't finding stuff there that they should be.

Numbers 1 and 2 are scattered around git(7), the two-part tutorial, the
git-core tutorial, etc.


I agree.  Unfortunately, people who need to use git but aren't
study-the-manual-first types *are* going to just dive in whether we want
them to or not, so we have to make it easy for them to pick up what they
need as they go.

How about this as a strawman "git user's manual" outline:

	I. Quick-start: drawn from the tutorial part I and everyday.txt?

	II. Basic git concepts, drawn from "discussion" in git(7) (the
	README), tutorial part II, this branching-and-merging tutorial, etc.:

		1. The commit graph and the object database
		2. References
		3. Fetching and pulling, remotes
		4. The index file

	III. Using git: 

		1. History exploration
		2. merge resolution
		3. pack files, fsck, repository maintenance
		4. pushing, setting up a public repo

	IV. Advanced examples: drawn from the howto directories,
	    cvs-migration.txt,...

		1. More complicated commandline magic, scripting
		   (history exploration with git-rev-list, etc.)
		2. History re-writing: cherry-picking, rebasing,...
		3. Setting up a shared public repo?
		4. Migration to/from other SCM's.

	IV. Technical details: core-tutorial.txt, plumbing, code tours, etc.

Chapter II is the prerequisite for everything else, so a lot of thought
has to be given to treating exactly what's necessary there and no more.
Maybe more of it could be mixed into chapter I.

It has to be readable in order by the 10% of people who actually like to
read manuals, and easy to pick up in the middle for the 90% who will
just dive into the section they were told they need to read to
understand some particular problem.

In particular, ideally only I and II would really be sequential, and
the rest would be readable in any order.

--b.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[DRAFT] Branching and merging with git, linux, (Thu Nov 16, 3:17 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Thu Nov 16, 4:47 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Thu Nov 16, 6:09 pm)
Re: [DRAFT] Branching and merging with git, linux, (Thu Nov 16, 6:13 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Thu Nov 16, 6:31 pm)
Re: [DRAFT] Branching and merging with git, linux, (Thu Nov 16, 8:17 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Thu Nov 16, 10:55 pm)
Re: [DRAFT] Branching and merging with git, Theodore Tso, (Fri Nov 17, 8:32 am)
Re: [DRAFT] Branching and merging with git, Sean, (Fri Nov 17, 8:57 am)
Re: [DRAFT] Branching and merging with git, Nguyen Thai Ngoc Duy, (Fri Nov 17, 9:19 am)
Re: [DRAFT] Branching and merging with git, Marko Macek, (Fri Nov 17, 9:25 am)
Re: [DRAFT] Branching and merging with git, Petr Baudis, (Fri Nov 17, 9:33 am)
Re: [DRAFT] Branching and merging with git, Sean, (Fri Nov 17, 9:34 am)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Fri Nov 17, 10:44 am)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Fri Nov 17, 11:21 am)
Re: [DRAFT] Branching and merging with git, linux, (Fri Nov 17, 5:13 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Fri Nov 17, 5:40 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Fri Nov 17, 6:11 pm)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Sun Nov 19, 10:50 am)
Git manuals, Petr Baudis, (Sun Nov 19, 10:59 am)
Re: Git manuals, J. Bruce Fields, (Sun Nov 19, 12:36 pm)
[DRAFT 2] Branching and merging with git, linux, (Mon Nov 20, 4:51 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Wed Nov 22, 4:51 am)
[PATCH] Documentation: add a "git user's manual", J. Bruce Fields, (Sat Nov 25, 9:01 pm)
Re: [DRAFT 2] Branching and merging with git, J. Bruce Fields, (Sun Dec 3, 6:19 pm)
Re: [DRAFT 2] Branching and merging with git, J. Bruce Fields, (Mon Dec 4, 12:23 am)
Re: [DRAFT 2] Branching and merging with git, Johannes Schindelin, (Mon Dec 4, 3:56 am)
Re: [DRAFT] Branching and merging with git, Theodore Tso, (Wed Jan 3, 10:04 am)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Wed Jan 3, 10:08 am)
Re: [DRAFT] Branching and merging with git, linux, (Wed Jan 3, 10:28 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Wed Jan 3, 11:11 pm)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Sun Jan 7, 4:44 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Sun Jan 7, 5:24 pm)
Re: [DRAFT] Branching and merging with git, Theodore Tso, (Sun Jan 7, 5:40 pm)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Sun Jan 7, 5:46 pm)
Re: [DRAFT] Branching and merging with git , Horst H. von Brand, (Sun Jan 7, 6:46 pm)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Sun Jan 7, 7:22 pm)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Sun Jan 7, 7:35 pm)
Re: [DRAFT] Branching and merging with git, Guilhem Bonnefille, (Mon Jan 8, 5:38 am)
Re: [DRAFT] Branching and merging with git, Theodore Tso, (Mon Jan 8, 7:03 am)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Mon Jan 8, 7:41 pm)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Mon Jan 8, 9:17 pm)
Re: [DRAFT] Branching and merging with git, Andreas Ericsson, (Tue Jan 9, 1:46 am)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Tue Jan 9, 8:49 am)
Re: [DRAFT] Branching and merging with git, Theodore Tso, (Tue Jan 9, 9:58 am)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Tue Jan 9, 9:15 pm)