1git-resolve(1) 2============== 3 4NAME 5---- 6git-resolve - Merge two commits 7 8 9SYNOPSIS 10-------- 11'git-resolve' <current> <merged> <message> 12 13DESCRIPTION 14----------- 15DEPRECATED and will be removed in 1.5.1. Use `git-merge` instead. 16 17Given two commits and a merge message, merge the <merged> commit 18into <current> commit, with the commit log message <message>. 19 20When <current> is a descendant of <merged>, or <current> is an 21ancestor of <merged>, no new commit is created and the <message> 22is ignored. The former is informally called "already up to 23date", and the latter is often called "fast forward". 24 25 26Author 27------ 28Written by Linus Torvalds <torvalds@osdl.org> and 29Dan Holmsand <holmsand@gmail.com>. 30 31Documentation 32-------------- 33Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. 34 35GIT 36--- 37Part of the gitlink:git[7] suite 38