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