index 921b38f18374c20d1f94c0907a629425acb38aa4..e0df1b33408df881057963896fb0d0d3cd5edd66 100644 (file)
SYNOPSIS
--------
+[verse]
'git merge-index' [-o] [-q] <merge-program> (-a | [--] <file>*)
DESCRIPTION
for the AA file, because it didn't exist in the original, and thus
'git merge-index' didn't even try to merge the MM thing).
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-One-shot merge by Petr Baudis <pasky@ucw.cz>
-
-Documentation
---------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
-
GIT
---
Part of the linkgit:git[1] suite