projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
merge-recursive: conflicting rename case.
[git.git]
/
Documentation
/
git-read-tree.txt
diff --git
a/Documentation/git-read-tree.txt
b/Documentation/git-read-tree.txt
index
27ee590
..
6fbd6d9
100644
(file)
--- a/
Documentation/git-read-tree.txt
+++ b/
Documentation/git-read-tree.txt
@@
-8,7
+8,7
@@
git-read-tree - Reads tree information into the index
SYNOPSIS
--------
-'git-read-tree' (<tree-ish> | [
-m [-u|
-i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
+'git-read-tree' (<tree-ish> | [
[-m | --reset] [-u |
-i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
DESCRIPTION