mirror of
https://github.com/git/git.git
synced 2024-11-05 00:37:55 +01:00
48bb914ed6
The point of these sections is generally to:
1. Give credit where it is due.
2. Give the reader an idea of where to ask questions or
file bug reports.
But they don't do a good job of either case. For (1), they
are out of date and incomplete. A much more accurate answer
can be gotten through shortlog or blame. For (2), the
correct contact point is generally git@vger, and even if you
wanted to cc the contact point, the out-of-date and
incomplete fields mean you're likely sending to somebody
useless.
So let's drop the fields entirely from all manpages except
git(1) itself. We already point people to the mailing list
for bug reports there, and we can update the Authors section
to give credit to the major contributors and point to
shortlog and blame for more information.
Each page has a "This is part of git" footer, so people can
follow that to the main git manpage.
78 lines
2.4 KiB
Text
78 lines
2.4 KiB
Text
git-merge-index(1)
|
|
==================
|
|
|
|
NAME
|
|
----
|
|
git-merge-index - Run a merge for files needing merging
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git merge-index' [-o] [-q] <merge-program> (-a | [--] <file>*)
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
This looks up the <file>(s) in the index and, if there are any merge
|
|
entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty
|
|
argument if no file), and <file> as argument 4. File modes for the three
|
|
files are passed as arguments 5, 6 and 7.
|
|
|
|
OPTIONS
|
|
-------
|
|
\--::
|
|
Do not interpret any more arguments as options.
|
|
|
|
-a::
|
|
Run merge against all files in the index that need merging.
|
|
|
|
-o::
|
|
Instead of stopping at the first failed merge, do all of them
|
|
in one shot - continue with merging even when previous merges
|
|
returned errors, and only return the error code after all the
|
|
merges.
|
|
|
|
-q::
|
|
Do not complain about a failed merge program (a merge program
|
|
failure usually indicates conflicts during the merge). This is for
|
|
porcelains which might want to emit custom messages.
|
|
|
|
If 'git merge-index' is called with multiple <file>s (or -a) then it
|
|
processes them in turn only stopping if merge returns a non-zero exit
|
|
code.
|
|
|
|
Typically this is run with a script calling git's imitation of
|
|
the 'merge' command from the RCS package.
|
|
|
|
A sample script called 'git merge-one-file' is included in the
|
|
distribution.
|
|
|
|
ALERT ALERT ALERT! The git "merge object order" is different from the
|
|
RCS 'merge' program merge object order. In the above ordering, the
|
|
original is first. But the argument order to the 3-way merge program
|
|
'merge' is to have the original in the middle. Don't ask me why.
|
|
|
|
Examples:
|
|
|
|
torvalds@ppc970:~/merge-test> git merge-index cat MM
|
|
This is MM from the original tree. # original
|
|
This is modified MM in the branch A. # merge1
|
|
This is modified MM in the branch B. # merge2
|
|
This is modified MM in the branch B. # current contents
|
|
|
|
or
|
|
|
|
torvalds@ppc970:~/merge-test> git merge-index cat AA MM
|
|
cat: : No such file or directory
|
|
This is added AA in the branch A.
|
|
This is added AA in the branch B.
|
|
This is added AA in the branch B.
|
|
fatal: merge program failed
|
|
|
|
where the latter example shows how 'git merge-index' will stop trying to
|
|
merge once anything has returned an error (i.e., `cat` returned an error
|
|
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).
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[1] suite
|