git-resolve(1)
NAME
git-resolve - Merge two commits
SYNOPSIS
git-resolve <current> <merged> <message>
DESCRIPTION
Array<message> is ignored. The former is informally called "already up
to date", and the latter is often called "fast forward".
AUTHOR
- Written by Linus Torvalds <torvalds@osdl.org> and Dan
- Holmsand <holmsand@gmail.com>.
DOCUMENTATION
- Documentation by David Greaves, Junio C Hamano and the
- git-list <git@vger.kernel.org>.
GIT
- Part of the git(7) suite
- 03/08/2007