Browse Source

Documentation: add a couple of missing docs.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 19 years ago
parent
commit
c16e30c088
  1. 37
      Documentation/git-merge-tree.txt
  2. 35
      Documentation/git-mktree.txt
  3. 21
      Documentation/git.txt

37
Documentation/git-merge-tree.txt

@ -0,0 +1,37 @@ @@ -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

35
Documentation/git-mktree.txt

@ -0,0 +1,35 @@ @@ -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

21
Documentation/git.txt

@ -100,6 +100,9 @@ gitlink:git-merge-index[1]:: @@ -100,6 +100,9 @@ gitlink:git-merge-index[1]::
gitlink:git-mktag[1]::
Creates a tag object.

gitlink:git-mktree[1]::
Build a tree-object from ls-tree formatted text.

gitlink:git-pack-objects[1]::
Creates a packed archive of objects.

@ -265,6 +268,9 @@ gitlink:git-checkout[1]:: @@ -265,6 +268,9 @@ gitlink:git-checkout[1]::
gitlink:git-cherry-pick[1]::
Cherry-pick the effect of an existing commit.

gitlink:git-clean[1]::
Remove untracked files from the working tree.

gitlink:git-clone[1]::
Clones a repository into a new directory.

@ -319,6 +325,9 @@ gitlink:git-resolve[1]:: @@ -319,6 +325,9 @@ gitlink:git-resolve[1]::
gitlink:git-revert[1]::
Revert an existing commit.

gitlink:git-rm[1]::
Remove files from the working tree and from the index.

gitlink:git-shortlog[1]::
Summarizes 'git log' output.

@ -357,6 +366,9 @@ gitlink:git-cvsimport[1]:: @@ -357,6 +366,9 @@ gitlink:git-cvsimport[1]::
gitlink:git-cvsexportcommit[1]::
Export a single commit to a CVS checkout.

gitlink:git-cvsserver[1]::
A CVS server emulator for git.

gitlink:git-lost-found[1]::
Recover lost refs that luckily have not yet been pruned.

@ -399,9 +411,15 @@ gitlink:git-count-objects[1]:: @@ -399,9 +411,15 @@ gitlink:git-count-objects[1]::
gitlink:git-daemon[1]::
A really simple server for git repositories.

gitlink:git-fmt-merge-msg[1]::
Produce a merge commit message.

gitlink:git-get-tar-commit-id[1]::
Extract commit ID from an archive created using git-tar-tree.

gitlink:git-imap-send[1]::
Dump a mailbox from stdin into an imap folder.

gitlink:git-mailinfo[1]::
Extracts patch and authorship information from a single
e-mail message, optionally transliterating the commit
@ -411,6 +429,9 @@ gitlink:git-mailsplit[1]:: @@ -411,6 +429,9 @@ gitlink:git-mailsplit[1]::
A stupid program to split UNIX mbox format mailbox into
individual pieces of e-mail.

gitlink:git-merge-tree[1]::
Show three-way merge without touching index.

gitlink:git-patch-id[1]::
Compute unique ID for a patch.


Loading…
Cancel
Save