diff options
| author | Sean Estabrooks <seanlkml@sympatico.ca> | 2006-04-28 13:15:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-28 21:31:36 (GMT) |
| commit | 48aeecdcc14684111ddb8ac0ec3bfdc5245ee75e (patch) | |
| tree | 8bccf0a85f4a65ca9acfb4746bd633f6903a6874 /Documentation/git-update-index.txt | |
| parent | 2eaf273d518717c84d748051e05210656f7b7e88 (diff) | |
| download | git-48aeecdcc14684111ddb8ac0ec3bfdc5245ee75e.zip git-48aeecdcc14684111ddb8ac0ec3bfdc5245ee75e.tar.gz git-48aeecdcc14684111ddb8ac0ec3bfdc5245ee75e.tar.bz2 | |
Fix up remaining man pages that use asciidoc "callouts".
Unfortunately docbook does not allow a callout to be
referenced from inside a callout list description.
Rewrite one paragraph in git-reset man page to work
around this limitation.
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Diffstat (limited to 'Documentation/git-update-index.txt')
| -rw-r--r-- | Documentation/git-update-index.txt | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 0a1b0ad..d4137fc 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@ -247,34 +247,33 @@ To update and refresh only the files already checked out: $ git-checkout-index -n -f -a && git-update-index --ignore-missing --refresh ---------------- -On an inefficient filesystem with `core.ignorestat` set: - +On an inefficient filesystem with `core.ignorestat` set:: ++ ------------ -$ git update-index --really-refresh <1> -$ git update-index --no-assume-unchanged foo.c <2> -$ git diff --name-only <3> +$ git update-index --really-refresh <1> +$ git update-index --no-assume-unchanged foo.c <2> +$ git diff --name-only <3> $ edit foo.c -$ git diff --name-only <4> +$ git diff --name-only <4> M foo.c -$ git update-index foo.c <5> -$ git diff --name-only <6> +$ git update-index foo.c <5> +$ git diff --name-only <6> $ edit foo.c -$ git diff --name-only <7> -$ git update-index --no-assume-unchanged foo.c <8> -$ git diff --name-only <9> +$ git diff --name-only <7> +$ git update-index --no-assume-unchanged foo.c <8> +$ git diff --name-only <9> M foo.c - -<1> forces lstat(2) to set "assume unchanged" bits for paths - that match index. +------------ ++ +<1> forces lstat(2) to set "assume unchanged" bits for paths that match index. <2> mark the path to be edited. <3> this does lstat(2) and finds index matches the path. -<4> this does lstat(2) and finds index does not match the path. +<4> this does lstat(2) and finds index does *not* match the path. <5> registering the new version to index sets "assume unchanged" bit. <6> and it is assumed unchanged. <7> even after you edit it. <8> you can tell about the change after the fact. <9> now it checks with lstat(2) and finds it has been changed. ------------- Configuration |