X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Fupdate-index.c;h=62d9f3f0fa358058fcf54e4fcbd4c3101b1279db;hb=385cc9d8c44eb5be9d57e630129752a72c0a08c8;hp=3ab214d24e537865875d6d1e3acd8cf6b019ff22;hpb=f9a518e884b62a76dde3b30aa5d0ac22381f47a8;p=git.git diff --git a/builtin/update-index.c b/builtin/update-index.c index 3ab214d24..62d9f3f0f 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -398,7 +398,7 @@ static void read_index_info(int line_termination) } static const char update_index_usage[] = -"git update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--skip-worktree|--no-skip-worktree] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--again | -g] [--ignore-missing] [-z] [--verbose] [--] ..."; +"git update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--skip-worktree|--no-skip-worktree] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--again | -g] [--ignore-missing] [-z] [--verbose] [--] [...]"; static unsigned char head_sha1[20]; static unsigned char merge_head_sha1[20];