[PATCH] Fix assertion failure when merging common ancestors.

[git.git] / Documentation / git.txt

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 617f416..aabc774 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -237,10 +237,18 @@ link:git-commit.html[git-commit]::
        Record changes to the repository.
        Previously this command was known as git-commit-script.
 
+link:git-diff.html[git-diff]::
+       git-diff.
+       Previously this command was known as git-diff-script.
+
 link:git-fetch.html[git-fetch]::
        Download from a remote repository via various protocols.
        Previously this command was known as git-fetch-script.
 
+link:git-format-patch.html[git-format-patch]::
+       git-format-patch.
+       Previously this command was known as git-format-patch-script.
+
 link:git-log.html[git-log]::
        Shows commit logs.
        Previously this command was known as git-log-script.
@@ -249,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.
@@ -391,19 +402,12 @@ link:git-send-email.html[git-send-email]::
 link:git-show-rev-cache.html[git-show-rev-cache]::
        Show the contents of a rev-cache file.
 
-Commands not yet documented
----------------------------
-
-link:git-diff.html[git-diff]::
-       git-diff.
-       Previously this command was known as git-diff-script.
+link:git-stripspace.html[git-stripspace]::
+       Filter out empty lines.
 
-link:git-format-patch.html[git-format-patch]::
-       git-format-patch.
-       Previously this command was known as git-format-patch-script.
 
-link:git-stripspace.html[git-stripspace]::
-       git-stripspace.
+Commands not yet documented
+---------------------------
 
 link:gitk.html[gitk]::
        gitk.