projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a conversion tool to migrate remote information into the config
[git.git]
/
update-index.c
diff --git
a/update-index.c
b/update-index.c
index
facec8d
..
9fa3d2b
100644
(file)
--- a/
update-index.c
+++ b/
update-index.c
@@
-473,7
+473,7
@@
static void read_index_info(int line_termination)
}
static const char update_index_usage[] =
}
static const char update_index_usage[] =
-"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--
cacheinfo] [--chmod=(+|-)x] [--info-only] [--force-remove] [--stdin] [--index-info
] [--ignore-missing] [-z] [--verbose] [--] <file>...";
+"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--
really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve
] [--ignore-missing] [-z] [--verbose] [--] <file>...";
static unsigned char head_sha1[20];
static unsigned char merge_head_sha1[20];
static unsigned char head_sha1[20];
static unsigned char merge_head_sha1[20];