From: Junio C Hamano Date: Wed, 22 Aug 2012 18:53:36 +0000 (-0700) Subject: Merge branch 'jc/doc-git-updates' X-Git-Tag: v1.8.0-rc0~139 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ac26684984c71d10c274224aea60bcf70ec45706?ds=inline;hp=-c Merge branch 'jc/doc-git-updates' A minor documentation update. * jc/doc-git-updates: Documentation: update the introductory section --- ac26684984c71d10c274224aea60bcf70ec45706 diff --combined Documentation/git.txt index 27da0eb209,2b4ab7d2f8..463d567a87 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@@ -22,18 -22,17 +22,17 @@@ unusually rich command set that provide and full access to internals. See linkgit:gittutorial[7] to get started, then see - link:everyday.html[Everyday Git] for a useful minimum set of commands, and - "man git-commandname" for documentation of each command. CVS users may - also want to read linkgit:gitcvs-migration[7]. See - the link:user-manual.html[Git User's Manual] for a more in-depth - introduction. + link:everyday.html[Everyday Git] for a useful minimum set of + commands. The link:user-manual.html[Git User's Manual] has a more + in-depth introduction. - The '' is either a name of a Git command (see below) or an alias - as defined in the configuration file (see linkgit:git-config[1]). + After you mastered the basic concepts, you can come back to this + page to learn what commands git offers. You can learn more about + individual git commands with "git help command". linkgit:gitcli[7] + manual page gives you an overview of the command line command syntax. - Formatted and hyperlinked version of the latest git - documentation can be viewed at - `http://git-htmldocs.googlecode.com/git/git.html`. + Formatted and hyperlinked version of the latest git documentation + can be viewed at `http://git-htmldocs.googlecode.com/git/git.html`. ifdef::stalenotes[] [NOTE] @@@ -44,21 -43,6 +43,21 @@@ unreleased) version of git, that is ava branch of the `git.git` repository. Documentation for older releases are available here: +* link:v1.7.12/git.html[documentation for release 1.7.12] + +* release notes for + link:RelNotes/1.7.12.txt[1.7.12]. + +* link:v1.7.11.5/git.html[documentation for release 1.7.11.5] + +* release notes for + link:RelNotes/1.7.11.5.txt[1.7.11.5], + link:RelNotes/1.7.11.4.txt[1.7.11.4], + link:RelNotes/1.7.11.3.txt[1.7.11.3], + link:RelNotes/1.7.11.2.txt[1.7.11.2], + link:RelNotes/1.7.11.1.txt[1.7.11.1], + link:RelNotes/1.7.11.txt[1.7.11]. + * link:v1.7.10.5/git.html[documentation for release 1.7.10.5] * release notes for @@@ -411,24 -395,6 +410,6 @@@ help ...` linkgit:git-replace[1] for more information. - FURTHER DOCUMENTATION - --------------------- - - See the references above to get started using git. The following is - probably more detail than necessary for a first-time user. - - The link:user-manual.html#git-concepts[git concepts chapter of the - user-manual] and linkgit:gitcore-tutorial[7] both provide - introductions to the underlying git architecture. - - See linkgit:gitworkflows[7] for an overview of recommended workflows. - - See also the link:howto-index.html[howto] documents for some useful - examples. - - The internals are documented in the - link:technical/api-index.html[GIT API documentation]. - GIT COMMANDS ------------ @@@ -744,7 -710,7 +725,7 @@@ othe 'GIT_EDITOR':: This environment variable overrides `$EDITOR` and `$VISUAL`. - It is used by several git comands when, on interactive mode, + It is used by several git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]. @@@ -848,6 -814,29 +829,29 @@@ The index is also capable of storing mu for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress. + FURTHER DOCUMENTATION + --------------------- + + See the references in the "description" section to get started + using git. The following is probably more detail than necessary + for a first-time user. + + The link:user-manual.html#git-concepts[git concepts chapter of the + user-manual] and linkgit:gitcore-tutorial[7] both provide + introductions to the underlying git architecture. + + See linkgit:gitworkflows[7] for an overview of recommended workflows. + + See also the link:howto-index.html[howto] documents for some useful + examples. + + The internals are documented in the + link:technical/api-index.html[GIT API documentation]. + + Users migrating from CVS may also want to + read linkgit:gitcvs-migration[7]. + + Authors ------- Git was started by Linus Torvalds, and is currently maintained by Junio