git-resolve(1) ============== NAME ---- git-resolve - Merge two commits SYNOPSIS -------- 'git-resolve' DESCRIPTION ----------- Given two commits and a merge message, merge the commit into commit, with the commit log message . When is a descendant of , or is an ancestor of , no new commit is created and the is ignored. The former is informally called "already up to date", and the latter is often called "fast forward". Author ------ Written by Linus Torvalds and Dan Holmsand . Documentation -------------- Documentation by David Greaves, Junio C Hamano and the git-list . GIT --- Part of the gitlink:git[7] suite