Re: [DRAFT] Branching and merging with git

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: J. Bruce Fields
Date: Sunday, January 7, 2007 - 4:44 pm

On Wed, Jan 03, 2007 at 12:04:11PM -0500, Theodore Tso wrote:

Just to throw more fuel on the fire....

I have a draft attempt at a complete "git user's manual" at

	http://www.fieldses.org/~bfields/

The goals are:

	- Readable from beginning to end in order without having read
	  any other git documentation beforehand.
	- Helpful section names and cross-references, so it's not too
	  hard to skip around some if you need to.
	- Organized to allow it to grow much larger (unlike the
	  tutorials)

It's more liesurely than tutorial.txt, but tries to stay focused on
practical how-to stuff.  It adds a discussion of how to resolve merge
conflicts, and partial instructions on setting up and dealing with a
public repository.

I've lifted a little bit from "branching and merging" (e.g., some of the
discussion of history diagrams), and could probably steal more if that's
OK.  (Similarly anyone should of course feel free to reuse bits of this
if any parts seem more useful than the whole.)

There's a lot of detail on managing branches and using git-fetch, just
because those are essential even to people needing read-only access
(e.g., kernel testers).  I think those sections will be much shorter
once the new "git remote" command and the disconnected checkouts are
taken into account.

I do feel bad about adding yet another piece of documentation, but I we
need something that goes through all the basics in a logical order, and
I wasn't seeing how to grow the tutorials into that.

Opinions?

--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)