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-one-file.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-one-file.txt')
| -rw-r--r-- | git-merge-one-file.txt | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/git-merge-one-file.txt b/git-merge-one-file.txt index a163cfca6..ee059def7 100644 --- a/git-merge-one-file.txt +++ b/git-merge-one-file.txt @@ -15,15 +15,6 @@ DESCRIPTION This is the standard helper program to use with 'git merge-index' to resolve a merge after the trivial merge done with 'git read-tree -m'. -Author ------- -Written by Linus Torvalds <torvalds@osdl.org>, -Junio C Hamano <gitster@pobox.com> and Petr Baudis <pasky@suse.cz>. - -Documentation --------------- -Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. - GIT --- Part of the linkgit:git[1] suite |