projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow finding things that begin with a dash in 'git grep'
[git.git]
/
Documentation
/
git.txt
diff --git
a/Documentation/git.txt
b/Documentation/git.txt
index
567d41a
..
aabc774
100644
(file)
--- 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.
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.
link:git-octopus.html[git-octopus]::
Merge more than two commits.
Previously this command was known as git-octopus-script.