mtbl_merge(1) [debian man page]

MTBL_MERGE(1)															     MTBL_MERGE(1)

NAME

       mtbl_merge - merge MTBL data from multiple input files into a single output file

SYNOPSIS

       User-provided functions:

       typedef void *
       (*mtbl_merge_init_func)(void);

       typedef void
       (*mtbl_merge_free_func)(void *clos);

       typedef void
       (*mtbl_merge_func)(void *clos,
	       const uint8_t *key, size_t len_key,
	       const uint8_t *val0, size_t len_val0,
	       const uint8_t *val1, size_t len_val1,
	       uint8_t **merged_val, size_t *len_merged_val);

       Command line tool:

       export MTBL_MERGE_DSO="libexample.so.0"
       export MTBL_MERGE_FUNC_PREFIX="example_merge"
       mtbl_merge INPUT [INPUT]... OUTPUT

DESCRIPTION

       mtbl_merge(1) is a command-line driver for the mtbl_merger(3) interface. The mtbl_merger(3) interface requires a user-provided merge
       function, which is loaded from a shared object whose filename is specified in the environment variable MTBL_MERGE_DSO.

       The user-provided merge function must have the same type as the mtbl_merge_func function type given above in the synopsis. The symbol name
       of the merge function to be loaded from the user-provided DSO will be constructed by appending "_func" to the string provided in the
       MTBL_MERGE_FUNC_PREFIX environment variable, which must be non-empty.

       Additionally, two optional functions may be provided: an "init" function whose symbol name is "_init" appended to the function prefix, and
       a "free" function whose symbol name is "_free" appended to the function prefix. If the "init" function exists, it will be called at the
       beginning, before any calls to the merge function, and the return value from the init function will be passed as the first argument to the
       merge function. If the "free" function exists, it will be called at the end, after any calls to the merge function, and its argument will
       be the return value of the "init" function.

       The environment variable MTBL_MERGE_BLOCK_SIZE may optionally be set in order to configure the MTBL block size (in bytes) of the output
       file.

SEE ALSO

       mtbl_merger(3)

								    05/29/2012							     MTBL_MERGE(1)

GIT-MERGE-INDEX(1)						    Git Manual							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 git(1) suite

Git 1.7.10.4							    11/24/2012							GIT-MERGE-INDEX(1)