undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/doc-git-updates' into maint

Browse Source 
* jc/doc-git-updates:
  Documentation: update the introductory section
This commit is contained in:
Junio C Hamano 2012-09-11 11:06:19 -07:00
commit 2af6d98a5e
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
Documentation/git.txt
View File

@ -22,18 +22,17 @@ unusually rich command set that provides both high-level operations
and full access to internals. and full access to internals.
See linkgit:gittutorial[7] to get started, then see See linkgit:gittutorial[7] to get started, then see
link:everyday.html[Everyday Git] for a useful minimum set of commands, and link:everyday.html[Everyday Git] for a useful minimum set of
"man git-commandname" for documentation of each command. CVS users may commands. The link:user-manual.html[Git User's Manual] has a more
also want to read linkgit:gitcvs-migration[7]. See in-depth introduction.
the link:user-manual.html[Git User's Manual] for a more in-depth
introduction.
The '<command>' is either a name of a Git command (see below) or an alias After you mastered the basic concepts, you can come back to this
as defined in the configuration file (see linkgit:git-config[1]). 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 Formatted and hyperlinked version of the latest git documentation
documentation can be viewed at can be viewed at `http://git-htmldocs.googlecode.com/git/git.html`.
`http://git-htmldocs.googlecode.com/git/git.html`.
ifdef::stalenotes[] ifdef::stalenotes[]
[NOTE] [NOTE]
@ -411,24 +410,6 @@ help ...`.
linkgit:git-replace[1] for more information. 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 GIT COMMANDS
------------ ------------
@ -848,6 +829,29 @@ The index is also capable of storing multiple entries (called "stages")
for a given pathname. These stages are used to hold the various for a given pathname. These stages are used to hold the various
unmerged version of a file when a merge is in progress. 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 Authors
------- -------
Git was started by Linus Torvalds, and is currently maintained by Junio Git was started by Linus Torvalds, and is currently maintained by Junio