diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index f7457ef487c71b4e4bec564c5b65b1b12d6ce121..09d01817c26b2f3555f59cab4d6e83a281b9abcd 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -182,7 +182,7 @@ has that commit at all). Since the object name is computed as a hash over the contents of the commit, you are guaranteed that the commit can never change without its name also changing. -In fact, in <> we shall see that everything stored in git +In fact, in <> we shall see that everything stored in git history, including file data and directory contents, is stored in an object with a name that is a hash of its contents. @@ -2708,12 +2708,16 @@ See gitlink:git-config[1] for more details on the configuration options mentioned above. -[[git-internals]] -Git internals -============= +[[git-concepts]] +Git concepts +============ -Git depends on two fundamental abstractions: the "object database", and -the "current directory cache" aka "index". +Git is built on a small number of simple but powerful ideas. While it +is possible to get things done without understanding them, you will find +git much more intuitive if you do. + +We start with the most important, the <> and the <>. [[the-object-database]] The Object Database