diff options
| author | David Greaves <david@dgreaves.com> | 2005-05-10 22:32:30 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-05-10 14:55:22 -0700 |
| commit | 2cf565c53c88c557eedd7e5629437b3c6fe74329 (patch) | |
| tree | bb04b39cf3fef50bc05825d953486a4d6bada056 /Documentation/git-resolve-script.txt | |
| parent | 3be4b61aa4ffb54a42c717772518b2a14b1e352b (diff) | |
| download | git-2cf565c53c88c557eedd7e5629437b3c6fe74329.tar.gz git-2cf565c53c88c557eedd7e5629437b3c6fe74329.tar.xz | |
[PATCH 1/4] split core-git.txt and update
Split the core-git.txt file
Formatting fix to the diff-format.txt
Signed-off-by: David Greaves <david@dgreaves.com>
Diffstat (limited to 'Documentation/git-resolve-script.txt')
| -rw-r--r-- | Documentation/git-resolve-script.txt | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/Documentation/git-resolve-script.txt b/Documentation/git-resolve-script.txt new file mode 100644 index 000000000..8dd84a381 --- /dev/null +++ b/Documentation/git-resolve-script.txt @@ -0,0 +1,30 @@ +git-resolve-script(1) +===================== +v0.1, May 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> + +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 + |