Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
add for_each_reflog_ent() iterator
[gitweb.git]
/
Documentation
/
git.txt
diff --git
a/Documentation/git.txt
b/Documentation/git.txt
index 6382ef0a02f9c40d5a46e10ea517a64bfa9ba42d..2a9e97dac1e2c21a8a4aa7a6501a054fcefbef35 100644
(file)
--- a/
Documentation/git.txt
+++ b/
Documentation/git.txt
@@
-351,6
+351,9
@@
gitlink:git-init-db[1]::
Creates an empty git object database, or reinitialize an
existing one.
+gitlink:git-merge-file[1]::
+ Runs a threeway merge.
+
gitlink:git-merge-index[1]::
Runs a merge for files needing merging.