kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
572 Commits
6 Branches
36 Tags
131 MiB
 
 
 
 
 
 
Tree: 09d9d1a648
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '09d9d1a648'
${ noResults }
git/Documentation/git-resolve-script.txt

30 lines
463 B
Raw Blame History

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