X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit.txt;h=2d0ca9d8ed09cd247e87adbc7be17f25ead1a353;hb=539d84fe0a661f4e273d8a22e74d55d2fafc7598;hp=5f068c2a1ab225755a443f6a34e3c4797481cd16;hpb=c2f3bf071ee90b01f2d629921bb04c4f798f02fa;p=git.git diff --git a/Documentation/git.txt b/Documentation/git.txt index 5f068c2a..2d0ca9d8 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,12 +43,13 @@ 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:everyday.html[Everyday GIT] as a guide to the +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. -The link:tutorial.html[tutorial] document covers how things +The link:core-tutorial.html[Core tutorial] document covers how things internally work. If you are migrating from CVS, link:cvs-migration.html[cvs @@ -139,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. @@ -309,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. @@ -422,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]:: @@ -582,7 +589,7 @@ git Diffs Discussion[[Discussion]] ------------------------ -include::../README[] +include::README[] Authors -------