{"thread":{"id":"4035","subject":"[PATCH] add documentation for update-index --unresolve","startedAt":"2006-05-03T10:53:19Z","lastAt":"2006-05-03T10:53:19Z","messageCount":1,"participants":["Matthias Kestenholz"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"19416","messageId":"20060503105319.GB10627@spinlock.ch","threadId":"4035","inReplyTo":null,"subject":"[PATCH] add documentation for update-index --unresolve","fromName":"Matthias Kestenholz","fromEmail":"matthias@spinlock.ch","sentAt":"2006-05-03T10:53:19Z","receivedAt":"2006-05-03T10:53:19Z","isPatch":true,"sender":{"key":"matthias@spinlock.ch","avatar":"https://gravatar.com/avatar/bc18f396e70163d09ab458a341b1decb7e8b6ee3aa2c0c954ec20162e67c4d46?d=mp&s=160"},"body":"Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>\n\n---\n\nI am not sure if this is already clear enough. Maybe this needs more\nexplanation in the manpage?\n\n---\n\n Documentation/git-update-index.txt |    6 +++++-\n update-index.c                     |    2 +-\n 2 files changed, 6 insertions(+), 2 deletions(-)\n\naa88546740e88b674335e26e342b53e623dcb5c6\ndiff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt\nindex 74844d1..a5afaaf 100644\n--- a/Documentation/git-update-index.txt\n+++ b/Documentation/git-update-index.txt\n@@ -15,7 +15,7 @@ SYNOPSIS\n \t     [--cacheinfo <mode> <object> <file>]\\*\n \t     [--chmod=(+|-)x]\n \t     [--assume-unchanged | --no-assume-unchanged]\n-\t     [--really-refresh]\n+\t     [--really-refresh] [--unresolve]\n \t     [--info-only] [--index-info]\n \t     [-z] [--stdin]\n \t     [--verbose]\n@@ -80,6 +80,10 @@ OPTIONS\n \tfilesystem that has very slow lstat(2) system call\n \t(e.g. cifs).\n \n+--unresolve::\n+\tRestores the 'unmerged' or 'needs updating' state of a\n+\tfile during a merge if it was cleared by accident.\n+\n --info-only::\n \tDo not create objects in the object database for all\n \t<file> arguments that follow this flag; just insert\ndiff --git a/update-index.c b/update-index.c\nindex facec8d..9fa3d2b 100644\n--- a/update-index.c\n+++ b/update-index.c\n@@ -473,7 +473,7 @@ static void read_index_info(int line_ter\n }\n \n static const char update_index_usage[] =\n-\"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--cacheinfo] [--chmod=(+|-)x] [--info-only] [--force-remove] [--stdin] [--index-info] [--ignore-missing] [-z] [--verbose] [--] <file>...\";\n+\"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>...\";\n \n static unsigned char head_sha1[20];\n static unsigned char merge_head_sha1[20];\n-- \n1.3.1.g7464\n"}]}