X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-tree.txt;h=3bfa7b422026181f675a7398d41e1153fdfbd837;hb=c72b9143f90f839fdfe34ea252e84cb43be71d95;hp=f869a7f00fa812bed068f5b60bd970d4dcac0655;hpb=a42332c21723fde9f36b579f6b39a23aa1aac137;p=git.git diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt index f869a7f00..3bfa7b422 100644 --- a/Documentation/git-merge-tree.txt +++ b/Documentation/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 tree. -Author ------- -Written by Linus Torvalds - -Documentation --------------- -Documentation by Junio C Hamano and the git-list . - GIT --- Part of the linkgit:git[1] suite