From 0f69be537618036c45bc07919248b88afbf7af3e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 9 Sep 2005 01:15:47 -0700 Subject: 'git-merge': Documentation. ... and add link from git.txt, as usual. Signed-off-by: Junio C Hamano --- Documentation/git.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Documentation/git.txt') 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. -- cgit v1.2.1