projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http-fetch: fix possible segfault
[git.git]
/
Documentation
/
git-update-index.txt
diff --git
a/Documentation/git-update-index.txt
b/Documentation/git-update-index.txt
index
4bdb2b0
..
3ae6e74
100644
(file)
--- a/
Documentation/git-update-index.txt
+++ b/
Documentation/git-update-index.txt
@@
-10,12
+10,12
@@
SYNOPSIS
--------
[verse]
'git-update-index'
--------
[verse]
'git-update-index'
- [--add] [--remove | --force-remove] [--replace]
- [--refresh
[-q] [--unmerged] [--ignore-missing]
]
+ [--add] [--remove | --force-remove] [--replace]
+ [--refresh
] [-q] [--unmerged] [--ignore-missing
]
[--cacheinfo <mode> <object> <file>]\*
[--chmod=(+|-)x]
[--assume-unchanged | --no-assume-unchanged]
[--cacheinfo <mode> <object> <file>]\*
[--chmod=(+|-)x]
[--assume-unchanged | --no-assume-unchanged]
- [--really-refresh] [--unresolve]
+ [--really-refresh] [--unresolve]
[--again]
[--info-only] [--index-info]
[-z] [--stdin]
[--verbose]
[--info-only] [--index-info]
[-z] [--stdin]
[--verbose]
@@
-40,7
+40,7
@@
OPTIONS
--remove::
If a specified file is in the index but is missing then it's
removed.
--remove::
If a specified file is in the index but is missing then it's
removed.
- Default behavio
u
r is to ignore removed file.
+ Default behavior is to ignore removed file.
--refresh::
Looks at the current index and checks to see if merges or
--refresh::
Looks at the current index and checks to see if merges or
@@
-80,6
+80,10
@@
OPTIONS
filesystem that has very slow lstat(2) system call
(e.g. cifs).
filesystem that has very slow lstat(2) system call
(e.g. cifs).
+--again::
+ Runs `git-update-index` itself on the paths whose index
+ entries are different from those from the `HEAD` commit.
+
--unresolve::
Restores the 'unmerged' or 'needs updating' state of a
file during a merge if it was cleared by accident.
--unresolve::
Restores the 'unmerged' or 'needs updating' state of a
file during a merge if it was cleared by accident.
@@
-113,7
+117,7
@@
OPTIONS
Only meaningful with `--stdin`; paths are separated with
NUL character instead of LF.
Only meaningful with `--stdin`; paths are separated with
NUL character instead of LF.
---::
+
\
--::
Do not interpret any more arguments as options.
<file>::
Do not interpret any more arguments as options.
<file>::