git.oblomov.eu Git - git/blob - Documentation/git-resolve-script.txt

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