From: Junio C Hamano <junkio@cox.net>
Date: Sun, 08 May 2005 20:28:03 GMT
Subject: Re: [PATCH 0/2] core-git documentation update
Message-ID: <7vd5s15up8.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <427E4AE1.2040105@dgreaves.com>

David, thanks for taking time to update the document.  I ended
up hand merging your two patches since I had a bit more
documentation updates in git-jc tree, so I'd like you to
proofread the result.  

It is my understanding that if I have a correct patch result
from your patch 1 and patch 2, I can throw away this message:

    Subject: [FILES] core-git documentation update

Am I correct?

I intend to keep not-so-controvercial stuff in git-jc tree, so
that when Linus returns he can pull from it instead of patching
from a pile of e-mails, potentially risking to leave good stuff
in his mailbox during that process.

The following diff is between:

    - Linus tree with two patches from you
    + The result of my hand merge, which I intend to ask Linus
      to pull when he returns.

Thanks.
---

# - 2: As Greaves
# + (working tree)
--- a/Documentation/core-git.txt
+++ b/Documentation/core-git.txt
@@ -473,7 +473,7 @@ git-diff-cache - Compares content and mo
 
 SYNOPSIS
 --------
-'git-diff-cache' [-p] [-r] [-z] [--cached] <tree-ish>
+'git-diff-cache' [-p] [-r] [-z] [-m] [--cached] <tree-ish>
 
 DESCRIPTION
 -----------
@@ -500,6 +500,12 @@ OPTIONS
 --cached::
 	do not consider the on-disk file at all
 
+-m::
+	By default, files recorded in the index but not checked
+	out are reported as deleted.  This flag makes
+	git-diff-cache say that all non-checked-out files are up
+	to date.
+
 Output format
 -------------
 include::diff-format.txt[]
@@ -1515,7 +1521,7 @@ git-update-cache - Modifies the index or
 SYNOPSIS
 --------
 'git-update-cache'
-	     [--add] [--remove] [--refresh]
+	     [--add] [--remove] [--refresh] [--replace]
 	     [--ignore-missing]
 	     [--force-remove <file>]
 	     [--cacheinfo <mode> <object> <file>]\*
@@ -1556,6 +1562,14 @@ OPTIONS
 	Remove the file from the index even when the working directory
 	still has such a file.
 
+--replace::
+	By default, when a file `path` exists in the index,
+	git-update-cache refuses an attempt to add `path/file`.
+	Similarly if a file `path/file` exists, a file `path`
+	cannot be added.  With --replace flag, existing entries
+	that conflicts with the entry being added are
+	automatically removed with warning messages.
+
 --::
 	Do not interpret any more arguments as options.