From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2011 23:08:00 +0000 (-0700)
Subject: Merge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3
X-Git-Tag: v1.7.7.4~3^2~1^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/eb4e67288bb9d66fb46092fa30d72c4bdded0c2a?ds=inline;hp=-c

Merge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3

* sn/doc-update-index-assume-unchanged:
Documentation/git-update-index: refer to 'ls-files'
---

eb4e67288bb9d66fb46092fa30d72c4bdded0c2a
diff --combined Documentation/git-update-index.txt
index 1ca56c85aa,d2ab35c999..c30f8cd44b
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@@ -12,7 -12,7 +12,7 @@@ SYNOPSI
  'git update-index'
  	     [--add] [--remove | --force-remove] [--replace]
  	     [--refresh] [-q] [--unmerged] [--ignore-missing]
 -	     [--cacheinfo <mode> <object> <file>]\*
 +	     [(--cacheinfo <mode> <object> <file>)...]
  	     [--chmod=(+|-)x]
  	     [--assume-unchanged | --no-assume-unchanged]
  	     [--skip-worktree | --no-skip-worktree]
@@@ -21,7 -21,7 +21,7 @@@
  	     [--info-only] [--index-info]
  	     [-z] [--stdin]
  	     [--verbose]
 -	     [--] [<file>]\*
 +	     [--] [<file>...]
  
  DESCRIPTION
  -----------
@@@ -93,6 -93,8 +93,6 @@@ OPTION
  This option can be also used as a coarse file-level mechanism
  to ignore uncommitted changes in tracked files (akin to what
  `.gitignore` does for untracked files).
 -You should remember that an explicit 'git add' operation will
 -still cause the file to be refreshed from the working tree.
  Git will fail (gracefully) in case it needs to modify this file
  in the index e.g. when merging in a commit;
  thus, in case the assumed-untracked file is changed upstream,
@@@ -144,8 -146,8 +144,8 @@@ you will need to handle the situation m
          Report what is being added and removed from index.
  
  -z::
 -	Only meaningful with `--stdin`; paths are separated with
 -	NUL character instead of LF.
 +	Only meaningful with `--stdin` or `--index-info`; paths are
 +	separated with NUL character instead of LF.
  
  \--::
  	Do not interpret any more arguments as options.
@@@ -264,7 -266,9 +264,9 @@@ tree files, you have to explicitly tel
  "assume unchanged" bit, either before or after you modify them.
  
  In order to set "assume unchanged" bit, use `--assume-unchanged`
- option.  To unset, use `--no-assume-unchanged`.
+ option.  To unset, use `--no-assume-unchanged`. To see which files
+ have the "assume unchanged" bit set, use `git ls-files -v`
+ (see linkgit:git-ls-files[1]).
  
  The command looks at `core.ignorestat` configuration variable.  When
  this is true, paths updated with `git update-index paths...` and
@@@ -363,7 -367,8 +365,8 @@@ ctime for marking files processed) (se
  SEE ALSO
  --------
  linkgit:git-config[1],
- linkgit:git-add[1]
+ linkgit:git-add[1],
+ linkgit:git-ls-files[1]
  
  
  Author