From: Junio C Hamano <junio@hera.kernel.org>
Date: Thu, 4 May 2006 00:46:53 +0000 (+0000)
Subject: Autogenerated man pages for v1.3.1-g935e
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eb9fc804c193ce1e3e55a0c3dccf83a3d5c05003;p=git.git

Autogenerated man pages for v1.3.1-g935e
---

diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1
index a6b18d914..5b25d98c1 100755
--- a/man1/git-diff-tree.1
+++ b/man1/git-diff-tree.1
@@ -179,7 +179,7 @@ git\-diff\-tree outputs a line with the commit ID when applicable\&. This flag s
 This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree\-ish>, or \fI\-\-stdin\fR)\&. It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the \fI\-m\fR option does)\&. Furthermore, it lists only files which were modified from all parents\&.
 
 .TP
-\-cc
+\-\-cc
 This flag changes the way a merge commit patch is displayed, in a similar way to the \fI\-c\fR option\&. It implies the \fI\-c\fR and \fI\-p\fR options and further compresses the patch output by omitting hunks that show differences from only one parent, or show the same change from all but one parent for an Octopus merge\&. When this optimization makes all hunks disappear, the commit itself and the commit log message is not shown, just like in any other "empty diff" case\&.
 
 .TP
diff --git a/man1/git-update-index.1 b/man1/git-update-index.1
index df57aceb3..cdde33066 100755
--- a/man1/git-update-index.1
+++ b/man1/git-update-index.1
@@ -25,11 +25,11 @@ git-update-index \- Modifies the index or directory cache
 .nf
 \fIgit\-update\-index\fR
              [\-\-add] [\-\-remove | \-\-force\-remove] [\-\-replace]
-             [\-\-refresh [\-q] [\-\-unmerged] [\-\-ignore\-missing]]
+             [\-\-refresh] [\-q] [\-\-unmerged] [\-\-ignore\-missing]
              [\-\-cacheinfo <mode> <object> <file>]*
              [\-\-chmod=(+|\-)x]
              [\-\-assume\-unchanged | \-\-no\-assume\-unchanged]
-             [\-\-really\-refresh]
+             [\-\-really\-refresh] [\-\-unresolve]
              [\-\-info\-only] [\-\-index\-info]
              [\-z] [\-\-stdin]
              [\-\-verbose]
@@ -86,6 +86,10 @@ Set the execute permissions on the updated files\&.
 \-\-assume\-unchanged, \-\-no\-assume\-unchanged
 When these flags are specified, the object name recorded for the paths are not updated\&. Instead, these options sets and unsets the "assume unchanged" bit for the paths\&. When the "assume unchanged" bit is on, git stops checking the working tree files for possible modifications, so you need to manually unset the bit to tell git when you change the working tree file\&. This is sometimes helpful when working with a big project on a filesystem that has very slow lstat(2) system call (e\&.g\&. cifs)\&.
 
+.TP
+\-\-unresolve
+Restores the \fIunmerged\fR or \fIneeds updating\fR state of a file during a merge if it was cleared by accident\&.
+
 .TP
 \-\-info\-only
 Do not create objects in the object database for all <file> arguments that follow this flag; just insert their object IDs into the index\&.