X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=README;h=f23eca890ea5bb75de15538cc00801fe71c1dd7e;hb=d6db01075b65da2b8584a0450619390893aae103;hp=250093063f5703f3ab02251de513d6203bf7f414;hpb=90c4851b1787dfc1d3d3a5cf78c558d136c69bdd;p=git.git diff --git a/README b/README index 25009306..f23eca89 100644 --- a/README +++ b/README @@ -95,7 +95,7 @@ The object types in some more detail: In particular, since the blob is entirely defined by its data, if two files in a directory tree (or in multiple different versions of the repository) have the same contents, they will - share the same blob object. The object is toally independent + share the same blob object. The object is totally independent of it's location in the directory tree, and renaming a file does not change the object that file is associated with in any way. @@ -265,7 +265,7 @@ main combinations: but to avoid common mistakes with filename globbing etc, the command will not normally add totally new entries or remove old - entries, i.e. it will normally just update existing cache entryes. + entries, i.e. it will normally just update existing cache entries. To tell git that yes, you really do realize that certain files no longer exist in the archive, or that new files should be @@ -283,7 +283,7 @@ main combinations: As a special case, you can also do "update-cache --refresh", which will refresh the "stat" information of each index to match the current stat information. It will _not_ update the object - status itself, and it wil only update the fields that are used + status itself, and it will only update the fields that are used to quickly test whether an object still matches its old backing store object. @@ -322,7 +322,7 @@ main combinations: changes in your working directory (i.e. "update-cache"). However, if you decide to jump to a new version, or check out - somebody elses version, or just restore a previous tree, you'd + somebody else's version, or just restore a previous tree, you'd populate your index file with read-tree, and then you need to check out the result with