提交 119550af 编写于 作者: J J. Bruce Fields 提交者: Junio C Hamano

Documentation: updates to "Everyday GIT"

Remove the introduction: I think it should be obvious why
we have this.  (And if it isn't obvious then we've got other
problems.)

Replace reference to git whatchanged by git log.

Miscellaneous style and grammar fixes.
Signed-off-by: NJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 84ab7b6f
Everyday GIT With 20 Commands Or So Everyday GIT With 20 Commands Or So
=================================== ===================================
GIT suite has over 100 commands, and the manual page for each of <<Basic Repository>> commands are needed by people who have a
them discusses what the command does and how it is used in
detail, but until you know what command should be used in order
to achieve what you want to do, you cannot tell which manual
page to look at, and if you know that already you do not need
the manual.
Does that mean you need to know all of them before you can use
git? Not at all. Depending on the role you play, the set of
commands you need to know is slightly different, but in any case
what you need to learn is far smaller than the full set of
commands to carry out your day-to-day work. This document is to
serve as a cheat-sheet and a set of pointers for people playing
various roles.
<<Basic Repository>> commands are needed by people who has a
repository --- that is everybody, because every working tree of repository --- that is everybody, because every working tree of
git is a repository. git is a repository.
...@@ -25,28 +10,27 @@ essential for anybody who makes a commit, even for somebody who ...@@ -25,28 +10,27 @@ essential for anybody who makes a commit, even for somebody who
works alone. works alone.
If you work with other people, you will need commands listed in If you work with other people, you will need commands listed in
<<Individual Developer (Participant)>> section as well. the <<Individual Developer (Participant)>> section as well.
People who play <<Integrator>> role need to learn some more People who play the <<Integrator>> role need to learn some more
commands in addition to the above. commands in addition to the above.
<<Repository Administration>> commands are for system <<Repository Administration>> commands are for system
administrators who are responsible to care and feed git administrators who are responsible for the care and feeding
repositories to support developers. of git repositories.
Basic Repository[[Basic Repository]] Basic Repository[[Basic Repository]]
------------------------------------ ------------------------------------
Everybody uses these commands to feed and care git repositories. Everybody uses these commands to maintain git repositories.
* gitlink:git-init-db[1] or gitlink:git-clone[1] to create a * gitlink:git-init-db[1] or gitlink:git-clone[1] to create a
new repository. new repository.
* gitlink:git-fsck-objects[1] to validate the repository. * gitlink:git-fsck-objects[1] to check the repository for errors.
* gitlink:git-prune[1] to garbage collect cruft in the * gitlink:git-prune[1] to remove unused objects in the repository.
repository.
* gitlink:git-repack[1] to pack loose objects for efficiency. * gitlink:git-repack[1] to pack loose objects for efficiency.
...@@ -78,8 +62,8 @@ $ git repack -a -d <1> ...@@ -78,8 +62,8 @@ $ git repack -a -d <1>
$ git prune $ git prune
------------ ------------
+ +
<1> pack all the objects reachable from the refs into one pack <1> pack all the objects reachable from the refs into one pack,
and remove unneeded other packs then remove the other packs.
Individual Developer (Standalone)[[Individual Developer (Standalone)]] Individual Developer (Standalone)[[Individual Developer (Standalone)]]
...@@ -93,9 +77,6 @@ following commands. ...@@ -93,9 +77,6 @@ following commands.
* gitlink:git-log[1] to see what happened. * gitlink:git-log[1] to see what happened.
* gitlink:git-whatchanged[1] to find out where things have
come from.
* gitlink:git-checkout[1] and gitlink:git-branch[1] to switch * gitlink:git-checkout[1] and gitlink:git-branch[1] to switch
branches. branches.
...@@ -120,7 +101,7 @@ following commands. ...@@ -120,7 +101,7 @@ following commands.
Examples Examples
~~~~~~~~ ~~~~~~~~
Extract a tarball and create a working tree and a new repository to keep track of it.:: Use a tarball as a starting point for a new repository:
+ +
------------ ------------
$ tar zxf frotz.tar.gz $ tar zxf frotz.tar.gz
...@@ -203,7 +184,7 @@ $ cd my2.6 ...@@ -203,7 +184,7 @@ $ cd my2.6
$ edit/compile/test; git commit -a -s <1> $ edit/compile/test; git commit -a -s <1>
$ git format-patch origin <2> $ git format-patch origin <2>
$ git pull <3> $ git pull <3>
$ git whatchanged -p ORIG_HEAD.. arch/i386 include/asm-i386 <4> $ git log -p ORIG_HEAD.. arch/i386 include/asm-i386 <4>
$ git pull git://git.kernel.org/pub/.../jgarzik/libata-dev.git ALL <5> $ git pull git://git.kernel.org/pub/.../jgarzik/libata-dev.git ALL <5>
$ git reset --hard ORIG_HEAD <6> $ git reset --hard ORIG_HEAD <6>
$ git prune <7> $ git prune <7>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册