git-reflog: gc.* configuration and documentation.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 6382ef0a02f9c40d5a46e10ea517a64bfa9ba42d..4ed3eed13d383cac4f1fa171b3ab6fb62f63c06a 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -224,6 +224,9 @@ gitlink:git-prune[1]::
 gitlink:git-quiltimport[1]::
        Applies a quilt patchset onto the current branch.
 
+gitlink:git-reflog[1]::
+       Manage reflog information.
+
 gitlink:git-relink[1]::
        Hardlink common objects in local repositories.
 
@@ -351,6 +354,9 @@ gitlink:git-init-db[1]::
        Creates an empty git object database, or reinitialize an
        existing one.
 
+gitlink:git-merge-file[1]::
+       Runs a threeway merge.
+
 gitlink:git-merge-index[1]::
        Runs a merge for files needing merging.