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----------- 15Given two commits and a merge message, merge the <merged> commit 16into <current> commit, with the commit log message <message>. 17 18When <current> is a descendant of <merged>, or <current> is an 19ancestor of <merged>, no new commit is created and the <message> 20is ignored. The former is informally called "already up to 21date", and the latter is often called "fast forward". 22 23 24Author 25------ 26Written by Linus Torvalds <torvalds@osdl.org> and 27Dan Holmsand <holmsand@gmail.com>. 28 29Documentation 30-------------- 31Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. 32 33GIT 34--- 35Part of the gitlink:git[7] suite 36