revision: factor out add_pending_sha1

diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 4987245aca2877f233ab26f2cf244430b2da8211..8c79ae8d2a610bf4f1dea1a840bfc52e85d90fd9 100644 (file)
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -26,7 +26,7 @@ OPTIONS
 --tool=<tool>::
        Use the merge resolution program specified by <tool>.
        Valid merge tools are:
-       araxis, diffuse, ecmerge, emerge, gvimdiff, kdiff3,
+       araxis, bc3, diffuse, ecmerge, emerge, gvimdiff, kdiff3,
        meld, opendiff, p4merge, tkdiff, tortoisemerge, vimdiff and xxdiff.
 +
 If a merge resolution program is not specified, 'git mergetool'
@@ -82,14 +82,6 @@ Setting the `mergetool.keepBackup` configuration variable to `false`
 causes `git mergetool` to automatically remove the backup as files
 are successfully merged.
 
-Author
-------
-Written by Theodore Y Ts'o <tytso@mit.edu>
-
-Documentation
---------------
-Documentation by Theodore Y Ts'o.
-
 GIT
 ---
 Part of the linkgit:git[1] suite