diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
commit | fce7c7e1549d1a2a2b0faf5952378236eed4d468 (patch) | |
tree | ffce2ae419b52786a0e567f4fddaadd89016f62c /git-update-index.txt | |
parent | bb8e996adf4293a0b624fe77e95e12ae8d1faed9 (diff) | |
download | git-htmldocs-fce7c7e1549d1a2a2b0faf5952378236eed4d468.tar.gz |
Autogenerated HTML docs for v1.5.6.1-156-ge903b
Diffstat (limited to 'git-update-index.txt')
-rw-r--r-- | git-update-index.txt | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/git-update-index.txt b/git-update-index.txt index bbb0a6ad5..999e9a7c8 100644 --- a/git-update-index.txt +++ b/git-update-index.txt @@ -9,7 +9,7 @@ git-update-index - Register file contents in the working tree to the index SYNOPSIS -------- [verse] -'git-update-index' +'git update-index' [--add] [--remove | --force-remove] [--replace] [--refresh] [-q] [--unmerged] [--ignore-missing] [--cacheinfo <mode> <object> <file>]\* @@ -31,7 +31,7 @@ cleared. See also linkgit: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 +The way `git-update-index` handles files it is told about can be modified using the various options: OPTIONS @@ -53,7 +53,7 @@ OPTIONS -q:: Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes - git-update-index continue anyway. + `git-update-index` continue anyway. --ignore-submodules: Do not try to update submodules. This option is only respected @@ -61,7 +61,7 @@ OPTIONS --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:: @@ -109,7 +109,7 @@ OPTIONS --replace:: By default, when a file `path` exists in the index, - git-update-index refuses an attempt to add `path/file`. + `git-update-index` refuses an attempt to add `path/file`. Similarly if a file `path/file` exists, a file `path` cannot be added. With --replace flag, existing entries that conflicts with the entry being added are @@ -145,7 +145,7 @@ up-to-date for mode/content changes. But what it *does* do is to can refresh the index for a file that hasn't been changed but where the stat entry is out of date. -For example, you'd want to do this after doing a "git-read-tree", to link +For example, you'd want to do this after doing a `git-read-tree`, to link up the stat index details with the proper files. Using --cacheinfo or --info-only @@ -157,7 +157,7 @@ merging. To pretend you have a file with mode and sha1 at path, say: ---------------- -$ git-update-index --cacheinfo mode sha1 path +$ git update-index --cacheinfo mode sha1 path ---------------- '--info-only' is used to register files without placing them in the object @@ -186,13 +186,13 @@ back on 3-way merge. . mode SP type SP sha1 TAB path + -The second format is to stuff git-ls-tree output +The second format is to stuff `git-ls-tree` output into the index file. . mode SP sha1 SP stage TAB path + This format is to put higher order stages into the -index file and matches git-ls-files --stage output. +index file and matches `git-ls-files --stage` output. To place a higher stage entry to the index, the path should first be removed by feeding a mode=0 entry for the path, and @@ -247,13 +247,13 @@ In order to set "assume unchanged" bit, use `--assume-unchanged` option. To unset, use `--no-assume-unchanged`. The command looks at `core.ignorestat` configuration variable. When -this is true, paths updated with `git-update-index paths...` and +this is true, paths updated with `git update-index paths...` and paths updated with other git commands that update both index and working tree (e.g. `git-apply --index`, `git-checkout-index -u`, and `git-read-tree -u`) are automatically marked as "assume unchanged". Note that "assume unchanged" bit is *not* set if -`git-update-index --refresh` finds the working tree file matches -the index (use `git-update-index --really-refresh` if you want +`git update-index --refresh` finds the working tree file matches +the index (use `git update-index --really-refresh` if you want to mark them as "assume unchanged"). @@ -262,7 +262,7 @@ Examples To update and refresh only the files already checked out: ---------------- -$ git-checkout-index -n -f -a && git-update-index --ignore-missing --refresh +$ git checkout-index -n -f -a && git update-index --ignore-missing --refresh ---------------- On an inefficient filesystem with `core.ignorestat` set:: |