diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2005-12-27 00:17:23 -0800 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2005-12-27 00:17:23 -0800 |
commit | 1a4e841b439ba014b365999c3a6b9e2be3740bd8 (patch) | |
tree | 263dbc68b55d73929f82a6d1f7df677dfb06e294 /git-merge-one-file.txt | |
download | git-htmldocs-1a4e841b439ba014b365999c3a6b9e2be3740bd8.tar.gz |
Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Diffstat (limited to 'git-merge-one-file.txt')
-rw-r--r-- | git-merge-one-file.txt | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/git-merge-one-file.txt b/git-merge-one-file.txt new file mode 100644 index 000000000..86aad37c6 --- /dev/null +++ b/git-merge-one-file.txt @@ -0,0 +1,30 @@ +git-merge-one-file(1) +===================== + +NAME +---- +git-merge-one-file - The standard helper program to use with "git-merge-index" + + +SYNOPSIS +-------- +'git-merge-one-file' + +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 <junkio@cox.net> 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 gitlink:git[7] suite + |