diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-09 01:15:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-10 18:30:42 -0700 |
| commit | 0f69be537618036c45bc07919248b88afbf7af3e (patch) | |
| tree | b9d98fbff2a5b6ec4b17656eea6321b251b9a0b9 /Documentation/git.txt | |
| parent | 2276aa6c098a0337bc2bec49742e332bdd1b802c (diff) | |
| download | git-0f69be537618036c45bc07919248b88afbf7af3e.tar.gz git-0f69be537618036c45bc07919248b88afbf7af3e.tar.xz | |
'git-merge': Documentation.
... and add link from git.txt, as usual.
Signed-off-by: Junio C Hamano <junkio@cox.net>
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. |