Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
rebase: implement --merge via the interactive machinery
[gitweb.git]
/
Documentation
/
git-merge-one-file.txt
diff --git
a/Documentation/git-merge-one-file.txt
b/Documentation/git-merge-one-file.txt
index ee059def79f85e770b23b34bce1dfc293434aa8b..04e803d5d3362c97e92efc22bdec4fe526946c6f 100644
(file)
--- a/
Documentation/git-merge-one-file.txt
+++ b/
Documentation/git-merge-one-file.txt
@@
-8,6
+8,7
@@
git-merge-one-file - The standard helper program to use with git-merge-index
SYNOPSIS
--------
+[verse]
'git merge-one-file'
DESCRIPTION