X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit.txt;h=aabc774961e90963562d92fe7fc0f299802483d3;hb=540bf654d007b3289adec37e3008c588ba677e25;hp=567d41a6bfb2aad4b852b86abd49511fed5ac6a1;hpb=35ef3a4c63d6b60cda8f26c842c0efee8d2cb5cc;p=git.git

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 567d41a6..aabc7749 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -257,6 +257,9 @@ link:git-ls-remote.html[git-ls-remote]::
 	Shows references in a remote or local repository.
 	Previously this command was known as git-ls-remote-script.
 
+link:git-merge.html[git-merge]::
+	Grand unified merge driver.
+
 link:git-octopus.html[git-octopus]::
 	Merge more than two commits.
 	Previously this command was known as git-octopus-script.