diff options
author | Junio C Hamano <junio@kernel.org> | 2011-03-15 23:33:35 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2011-03-15 23:33:35 +0000 |
commit | 5f3d8396896b8e8fffa113072041cb34e9167e8b (patch) | |
tree | 0d4d65f7767f700e03c07981e6163da5a23390c5 /git-merge-tree.txt | |
parent | 92faa8075fbefc0ac3d77a3c8b6f5b5f89f6d457 (diff) | |
download | git-htmldocs-5f3d8396896b8e8fffa113072041cb34e9167e8b.tar.gz |
Autogenerated HTML docs for v1.7.4.1-266-ga62ea
Diffstat (limited to 'git-merge-tree.txt')
-rw-r--r-- | git-merge-tree.txt | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/git-merge-tree.txt b/git-merge-tree.txt index f869a7f00..3bfa7b422 100644 --- a/git-merge-tree.txt +++ b/git-merge-tree.txt @@ -23,14 +23,6 @@ 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 the <branch1> tree. -Author ------- -Written by Linus Torvalds <torvalds@osdl.org> - -Documentation --------------- -Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. - GIT --- Part of the linkgit:git[1] suite |