1 .\"Generated by db2man.xsl. Don't modify this, modify the source.
10 .de Sp \" Vertical space (when we can't use .PP)
16 .ie \\n(.$>=3 .ne \\$3
20 .TH "GIT-RESOLVE" 1 "" "" ""
22 git-resolve \- Merge two commits
26 git\-resolve <current> <merged> <message>
31 Given two commits and a merge message, merge the <merged> commit into <current> commit, with the commit log message <message>\&.
34 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"\&.
39 Written by Linus Torvalds <torvalds@osdl\&.org> and Dan Holmsand <holmsand@gmail\&.com>\&.
44 Documentation by David Greaves, Junio C Hamano and the git\-list <git@vger\&.kernel\&.org>\&.
49 Part of the \fBgit\fR(7) suite