git-resolve(1)
==============

NAME
----
git-resolve - Merge two commits


SYNOPSIS
--------
'git-resolve' <current> <merged> <message>

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".


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

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

GIT
---
Part of the gitlink:git[7] suite