.\"Generated by db2man.xsl. Don't modify this, modify the source.
.de Sh \" Subsection
.br
.if t .Sp
.ne 5
.PP
\fB\\$1\fR
.PP
..
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.de Ip \" List item
.br
.ie \\n(.$>=3 .ne \\$3
.el .ne 3
.IP "\\$1" \\$2
..
.TH "GIT-RESOLVE" 1 "" "" ""
.SH NAME
git-resolve \- Merge two commits
.SH "SYNOPSIS"


git\-resolve <current> <merged> <message>

.SH "DESCRIPTION"


Given two commits and a merge message, merge the <merged> commit into <current> commit, with the commit log message <message>\&.


When <current> is a descendant of <merged>, or <current> is an ancestor of <merged>, no new commit is created and the <message> is ignored\&. The former is informally called "already up to date", and the latter is often called "fast forward"\&.

.SH "AUTHOR"


Written by Linus Torvalds <torvalds@osdl\&.org> and Dan Holmsand <holmsand@gmail\&.com>\&.

.SH "DOCUMENTATION"


Documentation by David Greaves, Junio C Hamano and the git\-list <git@vger\&.kernel\&.org>\&.

.SH "GIT"


Part of the \fBgit\fR(7) suite