diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-21 00:01:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-21 00:01:00 -0800 |
| commit | c2f3bf071ee90b01f2d629921bb04c4f798f02fa (patch) | |
| tree | 08ffe5b40e062d596deee47f3869278f4661a858 /Documentation/git.txt | |
| parent | 1ed91937e5cd59fdbdfa5f15f6fac132d2b21ce0 (diff) | |
| parent | 41f93a2c903a45167b26c2dc93d45ffa9a9bbd49 (diff) | |
GIT 1.0.0v1.0.0
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, 0 insertions, 3 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index 482eba7eba..5f068c2a1a 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -297,9 +297,6 @@ gitlink:git-merge[1]:: gitlink:git-mv[1]:: Move or rename a file, a directory, or a symlink. -gitlink:git-octopus[1]:: - Merge more than two commits. - gitlink:git-pull[1]:: Fetch from and merge with a remote repository. |