X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit.txt;h=2d0ca9d8ed09cd247e87adbc7be17f25ead1a353;hb=070879ca93a7d358086f4c8aff4553493dcb9210;hp=fc11516deb04fa525d21df3cdd0a2ed1bff6d0a8;hpb=2fa090b6c145db9f6219a037c773fb63fe727019;p=git.git diff --git a/Documentation/git.txt b/Documentation/git.txt index fc11516d..2d0ca9d8 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -33,32 +33,41 @@ OPTIONS environment variable. If no path is given 'git' will print the current setting and then exit. -CORE GIT COMMANDS ------------------ -Before reading this cover to cover, you may want to take a look -at the link:tutorial.html[tutorial] document. -The <> section below contains much useful definition -and clarification info - read that first. After that, if you -are interested in using git to manage (version control) -projects, read on commands listed in Porcelain-ish commands -section next. On the other hand, if you are writing your own -Porcelain, I suggest reading gitlink:git-update-index[1] and -gitlink:git-read-tree[1] first. +NOT LEARNING CORE GIT COMMANDS +------------------------------ + +This manual is intended to give complete background information +and internal workings of git, which may be too much for most +people. The <> section below contains much useful +definition and clarification - read that first. + +If you are interested in using git to manage (version control) +projects, use link:tutorial.html[The Tutorial] to get you started, +and then link:everyday.html[Everyday GIT] as a guide to the +minimum set of commands you need to know for day-to-day work. +Most likely, that will get you started, and you can go a long +way without knowing the low level details too much. -If you are migrating from CVS, link:cvs-migration.html[cvs migration] -document may be helpful after you finish the tutorial. +The link:core-tutorial.html[Core tutorial] document covers how things +internally work. + +If you are migrating from CVS, link:cvs-migration.html[cvs +migration] document may be helpful after you finish the +tutorial. After you get the general feel from the tutorial and this overview page, you may want to take a look at the link:howto-index.html[howto] documents. -David Greaves -08/05/05 +CORE GIT COMMANDS +----------------- + +If you are writing your own Porcelain, you need to be familiar +with most of the low level commands --- I suggest starting from +gitlink:git-update-index[1] and gitlink:git-read-tree[1]. -Updated by Junio C Hamano on 2005-05-05 and -further on 2005-12-07 to reflect recent changes. Commands Overview ----------------- @@ -131,6 +140,9 @@ Interrogation commands gitlink:git-cat-file[1]:: Provide content or type/size information for repository objects. +gitlink:git-describe[1]:: + Show the most recent tag that is reachable from a commit. + gitlink:git-diff-index[1]:: Compares content and mode of blobs between the index and repository. @@ -158,6 +170,9 @@ gitlink:git-merge-base[1]:: gitlink:git-name-rev[1]:: Find symbolic names for given revs. +gitlink:git-pack-redundant[1]:: + Find redundant pack files. + gitlink:git-rev-list[1]:: Lists commit objects in reverse chronological order. @@ -210,6 +225,9 @@ gitlink:git-receive-pack[1]:: gitlink:git-send-pack[1]:: Pushes to a remote repository, intelligently. +gitlink:git-http-push[1]:: + Push missing objects using HTTP/DAV. + gitlink:git-shell[1]:: Restricted shell for GIT-only SSH access. @@ -283,9 +301,6 @@ gitlink:git-merge[1]:: gitlink:git-mv[1]:: Move or rename a file, a directory, or a symlink. -gitlink:git-octopus[1]:: - Merge more than two commits. - gitlink:git-pull[1]:: Fetch from and merge with a remote repository. @@ -298,6 +313,9 @@ gitlink:git-rebase[1]:: gitlink:git-repack[1]:: Pack unpacked objects in a repository. +gitlink:git-rerere[1]:: + Reuse recorded resolution of conflicted merges. + gitlink:git-reset[1]:: Reset current HEAD to the specified state. @@ -339,6 +357,9 @@ gitlink:git-convert-objects[1]:: gitlink:git-cvsimport[1]:: Salvage your data out of another SCM people love to hate. +gitlink:git-cvsexportcommit[1]:: + Export a single commit to a CVS checkout. + gitlink:git-lost-found[1]:: Recover lost refs that luckily have not yet been pruned. @@ -408,7 +429,7 @@ gitlink:git-rev-parse[1]:: gitlink:git-send-email[1]:: Send patch e-mails out of "format-patch --mbox" output. -gitlink:git-symbolic-refs[1]:: +gitlink:git-symbolic-ref[1]:: Read and modify symbolic refs. gitlink:git-stripspace[1]:: @@ -568,18 +589,20 @@ git Diffs Discussion[[Discussion]] ------------------------ -include::../README[] +include::README[] Authors ------- - git's founding father is Linus Torvalds . - The current git nurse is Junio C Hamano . - The git potty was written by Andres Ericsson . - General upbringing is handled by the git-list . +* git's founding father is Linus Torvalds . +* The current git nurse is Junio C Hamano . +* The git potty was written by Andres Ericsson . +* General upbringing is handled by the git-list . Documentation -------------- -Documentation by David Greaves, Junio C Hamano and the git-list . +The documentation for git suite was started by David Greaves +, and later enhanced greatly by the +contributors on the git-list . GIT ---