diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-12-10 08:35:25 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-12-10 08:35:25 +0000 |
| commit | ec87f52676ecc7be43d1d7740a679a42b3192a01 (patch) | |
| tree | b8f74c54892b5aab6da3073eafc5216d05a2c174 /git-merge-tree.txt | |
| parent | b4028862764a27387da066ed28437f51376835cd (diff) | |
| download | git-htmldocs-ec87f52676ecc7be43d1d7740a679a42b3192a01.tar.gz | |
Autogenerated HTML docs for v1.6.1-rc2-14-g5363d
Diffstat (limited to 'git-merge-tree.txt')
| -rw-r--r-- | git-merge-tree.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-merge-tree.txt b/git-merge-tree.txt index dbb0c1866..f869a7f00 100644 --- a/git-merge-tree.txt +++ b/git-merge-tree.txt @@ -14,14 +14,14 @@ DESCRIPTION ----------- Reads three treeish, and output trivial merge results and conflicting stages to the standard output. This is similar to -what three-way read-tree -m does, but instead of storing the +what three-way 'git read-tree -m' does, but instead of storing the results in the index, the command outputs the entries to the standard output. This is meant to be used by higher level scripts to compute -merge results outside index, and stuff the results back into the +merge results outside of the index, and stuff the results back into the index. For this reason, the output from the command omits -entries that match <branch1> tree. +entries that match the <branch1> tree. Author ------ |