X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit.txt;h=fe34f50dc516d37b3d507c14afb53fe751131854;hb=6a1640ffc6431d66fa33c8256fd19b5ee0bc1b47;hp=92cfe0ee31a3ce6fc85ac4041ae9bb17e6419a8d;hpb=5df466c507ee2dd81c2e9002c3fedf3536cde0dc;p=git.git diff --git a/Documentation/git.txt b/Documentation/git.txt index 92cfe0ee..fe34f50d 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -20,15 +20,16 @@ brings your stuff to the plumbing). OPTIONS ------- --version:: - prints the git suite version that the 'git' program came from. + Prints the git suite version that the 'git' program came from. --help:: - prints the synopsis and a list of available commands. - If a git command is named this option will bring up the - man-page for that command. + Prints the synopsis and a list of the most commonly used + commands. If a git command is named this option will bring up + the man-page for that command. If the option '--all' or '-a' is + given then all available commands are printed. --exec-path:: - path to wherever your core git programs are installed. + Path to wherever your core git programs are installed. This can also be controlled by setting the GIT_EXEC_PATH environment variable. If no path is given 'git' will print the current setting and then exit. @@ -43,12 +44,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 @@ -312,6 +314,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. @@ -324,6 +329,9 @@ gitlink:git-revert[1]:: gitlink:git-shortlog[1]:: Summarizes 'git log' output. +gitlink:git-show[1]:: + Show one commit log and its diff. + gitlink:git-show-branch[1]:: Show branches and their commits. @@ -513,16 +521,14 @@ HEAD:: a valid head 'name' (i.e. the contents of `$GIT_DIR/refs/heads/`). -:: - a valid snapshot 'name' - (i.e. the contents of `$GIT_DIR/refs/snap/`). - File/Directory Structure ------------------------ Please see link:repository-layout.html[repository layout] document. +Read link:hooks.html[hooks] for more details about each hook. + Higher level SCMs may provide and manage additional information in the `$GIT_DIR`. @@ -585,7 +591,7 @@ git Diffs Discussion[[Discussion]] ------------------------ -include::../README[] +include::README[] Authors -------