projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge-recursive: conflicting rename case.
[git.git]
/
Documentation
/
git.txt
diff --git
a/Documentation/git.txt
b/Documentation/git.txt
index
482eba7
..
5f068c2
100644
(file)
--- 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-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.
gitlink:git-pull[1]::
Fetch from and merge with a remote repository.