add documentation for update-index --unresolve

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index d4137fc87e0f52d775878cf239fe98182002cc95..4bdb2b0ffa63199a21c21a1a5c5e6703d0b33f02 100644 (file)
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -15,7 +15,7 @@ SYNOPSIS
             [--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

diff --git a/update-index.c b/update-index.c
index facec8d91524ab63117d62134f91df385dcf34ca..9fa3d2bb96a6e01a6d28fa80efc60871ca32dbf9 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];