-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Documentation: add a couple of missing docs.
Signed-off-by: Junio C Hamano <junkio@cox.net>
- Loading branch information
Junio C Hamano
committed
Apr 13, 2006
1 parent
0237628
commit c16e30c
Showing
3 changed files
with
93 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
git-merge-tree(1) | ||
================= | ||
|
||
NAME | ||
---- | ||
git-merge-tree - Show three-way merge without touching index | ||
|
||
|
||
SYNOPSIS | ||
-------- | ||
'git-merge-tree' <base-tree> <branch1> <branch2> | ||
|
||
DESCRIPTION | ||
----------- | ||
Reads three treeish, and output trivial merge results and | ||
conflicting stages to the standard output. This is similar to | ||
what three-way read-tree -m does, but instead of storing the | ||
results in the index, the command outputs the entries to the | ||
standard output. | ||
|
||
This is meant to be used by higher level scripts to compute | ||
merge results outside index, and stuff the results back into the | ||
index. For this reason, the output from the command omits | ||
entries that match <branch1> tree. | ||
|
||
Author | ||
------ | ||
Written by Linus Torvalds <torvalds@osdl.org> | ||
|
||
Documentation | ||
-------------- | ||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. | ||
|
||
GIT | ||
--- | ||
Part of the gitlink:git[7] suite | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
git-mktree(1) | ||
============= | ||
|
||
NAME | ||
---- | ||
git-mktree - Build a tree-object from ls-tree formatted text | ||
|
||
|
||
SYNOPSIS | ||
-------- | ||
'git-mktree' [-z] | ||
|
||
DESCRIPTION | ||
----------- | ||
Reads standard input in non-recursive `ls-tree` output format, | ||
and creates a tree object. The object name of the tree object | ||
built is written to the standard output. | ||
|
||
OPTIONS | ||
------- | ||
-z:: | ||
Read the NUL-terminated `ls-tree -z` output instead. | ||
|
||
Author | ||
------ | ||
Written by Junio C Hamano <junkio@cox.net> | ||
|
||
Documentation | ||
-------------- | ||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. | ||
|
||
GIT | ||
--- | ||
Part of the gitlink:git[7] suite | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters