@matheusbsbs / matheus-bagliano / commits / c16e30c088
Fork 0

Documentation: add a couple of missing docs.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Apr 13, 2006 at 00:09 UTC c16e30c0884549d48a73d7f2ebbbb470a0e1576b
3 files changed +93
Documentation/git-merge-tree.txt new
+37
@@ -0,0 +1,37 @@
1 +git-merge-tree(1)
2 +=================
3 +
4 +NAME
5 +----
6 +git-merge-tree - Show three-way merge without touching index
7 +
8 +
9 +SYNOPSIS
10 +--------
11 +'git-merge-tree' <base-tree> <branch1> <branch2>
12 +
13 +DESCRIPTION
14 +-----------
15 +Reads three treeish, and output trivial merge results and
16 +conflicting stages to the standard output. This is similar to
17 +what three-way read-tree -m does, but instead of storing the
18 +results in the index, the command outputs the entries to the
19 +standard output.
20 +
21 +This is meant to be used by higher level scripts to compute
22 +merge results outside index, and stuff the results back into the
23 +index. For this reason, the output from the command omits
24 +entries that match <branch1> tree.
25 +
26 +Author
27 +------
28 +Written by Linus Torvalds <torvalds@osdl.org>
29 +
30 +Documentation
31 +--------------
32 +Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
33 +
34 +GIT
35 +---
36 +Part of the gitlink:git[7] suite
37 +
Documentation/git-mktree.txt new
+35
@@ -0,0 +1,35 @@
1 +git-mktree(1)
2 +=============
3 +
4 +NAME
5 +----
6 +git-mktree - Build a tree-object from ls-tree formatted text
7 +
8 +
9 +SYNOPSIS
10 +--------
11 +'git-mktree' [-z]
12 +
13 +DESCRIPTION
14 +-----------
15 +Reads standard input in non-recursive `ls-tree` output format,
16 +and creates a tree object. The object name of the tree object
17 +built is written to the standard output.
18 +
19 +OPTIONS
20 +-------
21 +-z::
22 + Read the NUL-terminated `ls-tree -z` output instead.
23 +
24 +Author
25 +------
26 +Written by Junio C Hamano <junkio@cox.net>
27 +
28 +Documentation
29 +--------------
30 +Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
31 +
32 +GIT
33 +---
34 +Part of the gitlink:git[7] suite
35 +
Documentation/git.txt
+21
@@ -100,6 +100,9 @@ gitlink:git-merge-index[1]::
100 gitlink:git-mktag[1]::
101 Creates a tag object.
102
103 +gitlink:git-mktree[1]::
104 + Build a tree-object from ls-tree formatted text.
105 +
106 gitlink:git-pack-objects[1]::
107 Creates a packed archive of objects.
108
@@ -265,6 +268,9 @@ gitlink:git-checkout[1]::
268 gitlink:git-cherry-pick[1]::
269 Cherry-pick the effect of an existing commit.
270
271 +gitlink:git-clean[1]::
272 + Remove untracked files from the working tree.
273 +
274 gitlink:git-clone[1]::
275 Clones a repository into a new directory.
276
@@ -319,6 +325,9 @@ gitlink:git-resolve[1]::
325 gitlink:git-revert[1]::
326 Revert an existing commit.
327
328 +gitlink:git-rm[1]::
329 + Remove files from the working tree and from the index.
330 +
331 gitlink:git-shortlog[1]::
332 Summarizes 'git log' output.
333
@@ -357,6 +366,9 @@ gitlink:git-cvsimport[1]::
366 gitlink:git-cvsexportcommit[1]::
367 Export a single commit to a CVS checkout.
368
369 +gitlink:git-cvsserver[1]::
370 + A CVS server emulator for git.
371 +
372 gitlink:git-lost-found[1]::
373 Recover lost refs that luckily have not yet been pruned.
374
@@ -399,9 +411,15 @@ gitlink:git-count-objects[1]::
411 gitlink:git-daemon[1]::
412 A really simple server for git repositories.
413
414 +gitlink:git-fmt-merge-msg[1]::
415 + Produce a merge commit message.
416 +
417 gitlink:git-get-tar-commit-id[1]::
418 Extract commit ID from an archive created using git-tar-tree.
419
420 +gitlink:git-imap-send[1]::
421 + Dump a mailbox from stdin into an imap folder.
422 +
423 gitlink:git-mailinfo[1]::
424 Extracts patch and authorship information from a single
425 e-mail message, optionally transliterating the commit
@@ -411,6 +429,9 @@ gitlink:git-mailsplit[1]::
429 A stupid program to split UNIX mbox format mailbox into
430 individual pieces of e-mail.
431
432 +gitlink:git-merge-tree[1]::
433 + Show three-way merge without touching index.
434 +
435 gitlink:git-patch-id[1]::
436 Compute unique ID for a patch.
437