NAME
git-merge-tree - Show three-way merge without touching index
SYNOPSIS
git merge-tree <base-tree> <branch1> <branch2>
DESCRIPTION
Reads three tree-ish, and output trivial merge results and conflicting stages to the standard output. This is similar to what three-way git read-tree -m does, but instead of storing the results in the index, the command outputs the entries to the standard output. This is meant to be used by higher level scripts to compute merge results outside of the index, and stuff the results back into the index. For this reason, the output from the command omits entries that match the <branch1> tree.
GIT
Part of the git(1) suite
More Linux Commands
manpages/ip.7.html
ip(7) - Linux IPv4 protocol implementation - Linux man page
Linux implements the Internet Protocol, version 4, described in RFC 791 and RFC 1122. ip contains a level 2 multicasting implementation conforming to RFC 1112.
manpages/getaddrinfo_a.3.html
getaddrinfo_a(3) - asynchronous network address and service
The getaddrinfo_a() function performs the same task as getaddrinfo(3), but allows multiple name look-ups to be performed asynchronously, with optional notificat
manpages/spawn.8.html
spawn(8) - Postfix external command spawner - Linux man page
The spawn(8) daemon provides the Postfix equivalent of inetd. It listens on a port as specified in the Postfix master.cf file and spawns an external command whe
manpages/idmap_tdb.8.html
idmap_tdb(8) - Samba's idmap_tdb Backend for Winbind........
The idmap_tdb plugin is the default backend used by winbindd for storing SID/uid/gid mapping tables. In contrast to read only backends like idmap_rid, it is an
manpages/pcre_jit_stack_free.3.html
pcre_jit_stack_free(3) Perl-compatible regular expressions
This function is used to free a JIT stack that was created by pcre[16|32]_jit_stack_alloc() when it is no longer needed. For more details, see the pcrejit page.
manpages/Ttk_GetStickyFromObj.3.html
Ttk_GetStickyFromObj(3) - Tk themed geometry utilities......
The Ttk_Box structure represents a rectangular region of a window: typedef struct { int x; int y; int width; int height; } Ttk_Box; All coordinates are relative
manpages/qgcvt.3.html
qgcvt(3) - convert a floating-point number to a string......
The functions qecvt(), qfcvt() and qgcvt() are identical to ecvt(3), fcvt(3) and gcvt(3) respectively, except that they use a long double argument number. See e
manpages/mimecheck.1.html
mimecheck(1) - determine the type of the MIME encoded of an
The scripts mimecheck, mimezip, mimebzip, and mimegzip can be used to determine the contents of MIME encoded attachments of the type application/octet-stream. T
manpages/HeightOfScreen.3.html
HeightOfScreen(3) - screen information functions and macros
The BlackPixelOfScreen macro returns the black pixel value of the specified screen. The WhitePixelOfScreen macro returns the white pixel value of the specified
manpages/digitaglinktree.1.html
digitaglinktree(1) - Export tag structure of photos in digik
digitaglinktree will create a linktree for all photos in a digikam database that have tags set on them. Tags (like eg. family, events, ...) are used in digikam
manpages/Tcl_GetEncoding.3.html
Tcl_GetEncoding(3) - procedures for creating and using encod
Tcl_GetEncoding finds an encoding given its name. The name may refer to a built-in Tcl encoding, a user-defined encoding registered by calling Tcl_CreateEncodin
manpages/efikeygen.1.html
efikeygen(1) command line tool for generating keys to use fo
efikeygen is a command line tool for generating keys and certificates to be used with pesign. These are standard X.509 certificates, and can potentially be gene
