diff options
Diffstat (limited to 'Documentation/git.txt')
| -rw-r--r-- | Documentation/git.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index 567d41a6b..aabc77496 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. |