projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'jc/show-branch-dense'
[git.git]
/
Documentation
/
git-update-index.txt
diff --git
a/Documentation/git-update-index.txt
b/Documentation/git-update-index.txt
index
d4137fc
..
23f2b6f
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]
+ [--really-refresh]
[--unresolve]
[--info-only] [--index-info]
[-z] [--stdin]
[--verbose]
[--info-only] [--index-info]
[-z] [--stdin]
[--verbose]
@@
-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).
+--unresolve::
+ Restores the 'unmerged' or 'needs updating' state of a
+ file during a merge if it was cleared by accident.
+
--info-only::
Do not create objects in the object database for all
<file> arguments that follow this flag; just insert
--info-only::
Do not create objects in the object database for all
<file> arguments that follow this flag; just insert