Merge branch 'maint'

[git.git] / Documentation / git-update-index.txt

diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index cd5e014d4899954b204173f6e1d84e011a307ac8..0a1953803e48947f6eeae385550ac2cd4e838411 100644 (file)
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -27,6 +27,9 @@ Modifies the index or directory cache. Each file mentioned is updated
 into the index and any 'unmerged' or 'needs updating' state is
 cleared.
 
 into the index and any 'unmerged' or 'needs updating' state is
 cleared.
 

+See also gitlink:git-add[1] for a more user-friendly way to do some of
+the most common operations on the index.
+

 The way "git-update-index" handles files it is told about can be modified
 using the various options:
 
 The way "git-update-index" handles files it is told about can be modified
 using the various options:
 


@@ -53,7 +56,7 @@ OPTIONS
 
 --unmerged::
         If --refresh finds unmerged changes in the index, the default
 
 --unmerged::
         If --refresh finds unmerged changes in the index, the default

-        behavior is to error out.  This option makes git-update-index 
+        behavior is to error out.  This option makes git-update-index

         continue anyway.
 
 --ignore-missing::
         continue anyway.
 
 --ignore-missing::


@@ -61,12 +64,12 @@ OPTIONS
 
 --cacheinfo <mode> <object> <path>::
        Directly insert the specified info into the index.
 
 --cacheinfo <mode> <object> <path>::
        Directly insert the specified info into the index.

-       
+

 --index-info::
         Read index information from stdin.
 
 --chmod=(+|-)x::
 --index-info::
         Read index information from stdin.
 
 --chmod=(+|-)x::

-        Set the execute permissions on the updated files.        
+        Set the execute permissions on the updated files.

 
 --assume-unchanged, --no-assume-unchanged::
        When these flags are specified, the object name recorded
 
 --assume-unchanged, --no-assume-unchanged::
        When these flags are specified, the object name recorded


@@ -123,7 +126,7 @@ OPTIONS
 <file>::
        Files to act on.
        Note that files beginning with '.' are discarded. This includes
 <file>::
        Files to act on.
        Note that files beginning with '.' are discarded. This includes

-       `./file` and `dir/./file`. If you don't want this, then use     
+       `./file` and `dir/./file`. If you don't want this, then use

        cleaner names.
        The same applies to directories ending '/' and paths with '//'
 
        cleaner names.
        The same applies to directories ending '/' and paths with '//'
 


@@ -306,7 +309,8 @@ The command looks at `core.ignorestat` configuration variable.  See
 
 See Also
 --------
 
 See Also
 --------

-gitlink:git-config[1]
+gitlink:git-config[1],
+gitlink:git-add[1]

 
 
 Author
 
 
 Author


@@ -320,4 +324,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 GIT
 ---
 Part of the gitlink:git[7] suite
 GIT
 ---
 Part of the gitlink:git[7] suite

-