Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'nd/upload-pack-shallow-must-be-commit'
[gitweb.git]
/
Documentation
/
git-merge-tree.txt
diff --git
a/Documentation/git-merge-tree.txt
b/Documentation/git-merge-tree.txt
index 3bfa7b422026181f675a7398d41e1153fdfbd837..c5f84b649504f1708be9cd925023af3afd685337 100644
(file)
--- a/
Documentation/git-merge-tree.txt
+++ b/
Documentation/git-merge-tree.txt
@@
-8,6
+8,7
@@
git-merge-tree - Show three-way merge without touching index
SYNOPSIS
--------
+[verse]
'git merge-tree' <base-tree> <branch1> <branch2>
DESCRIPTION