diff options
Diffstat (limited to 'Documentation/git-resolve-script.txt')
| -rw-r--r-- | Documentation/git-resolve-script.txt | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/Documentation/git-resolve-script.txt b/Documentation/git-resolve-script.txt new file mode 100644 index 0000000000..99c399a073 --- /dev/null +++ b/Documentation/git-resolve-script.txt @@ -0,0 +1,31 @@ +git-resolve-script(1) +===================== +v0.99.4, Aug 2005 + +NAME +---- +git-resolve-script - Script used to merge two trees + + +SYNOPSIS +-------- +'git-resolve-script' + +DESCRIPTION +----------- +This script is used by Linus to merge two trees. + + +Author +------ +Written by Linus Torvalds <torvalds@osdl.org> and +Dan Holmsand <holmsand@gmail.com>. + +Documentation +-------------- +Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. + +GIT +--- +Part of the link:git.html[git] suite + |