summaryrefslogtreecommitdiff
path: root/Documentation/git-read-tree.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-19 18:33:14 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-20 22:07:52 (GMT)
commitf318dd229f9df88470de8541916d48c9380e2e35 (patch)
treeac0d21f1e1711c5b1adfdaed59056200aa0bd84f /Documentation/git-read-tree.txt
parenta7154e916c6fab01dfb67629dae8c4430daff669 (diff)
downloadgit-f318dd229f9df88470de8541916d48c9380e2e35.zip
git-f318dd229f9df88470de8541916d48c9380e2e35.tar.gz
git-f318dd229f9df88470de8541916d48c9380e2e35.tar.bz2
Document -i flag to git-read-tree
Somehow I missed it when we updated read-tree to support the recursive merge strategy. Also -i should require -m as well, which the command did not check. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-read-tree.txt')
-rw-r--r--Documentation/git-read-tree.txt12
1 files changed, 11 insertions, 1 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 2178a0a..0639bd0 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -9,7 +9,7 @@ git-read-tree - Reads tree information into the directory cache
SYNOPSIS
--------
-'git-read-tree' (<tree-ish> | [-m [-u]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
+'git-read-tree' (<tree-ish> | [-m [-u|-i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
DESCRIPTION
@@ -35,6 +35,16 @@ OPTIONS
After a successful merge, update the files in the work
tree with the result of the merge.
+-i::
+ Usually a merge requires the index file as well as the
+ files in the working tree are up to date with the
+ current head commit, in order not to lose local
+ changes. This flag disables the check with the working
+ tree and is meant to be used when creating a merge of
+ trees that are not directly related to the current
+ working tree status into a temporary index file.
+
+
<tree-ish#>::
The id of the tree object(s) to be read/merged.