Documentation/git-merge-one-file-script.txt

   1 git-merge-one-file-script(1)
   2 ============================
   3 v0.99.4, Aug 2005
   4
   5 NAME
   6 ----
   7 git-merge-one-file-script - The standard helper program to use with "git-merge-cache"
   8
   9
  10 SYNOPSIS
  11 --------
  12 'git-merge-one-file-script'
  13
  14 DESCRIPTION
  15 -----------
  16 This is the standard helper program to use with "git-merge-cache"
  17 to resolve a merge after the trivial merge done with "git-read-tree -m".
  18
  19 Author
  20 ------
  21 Written by Linus Torvalds <torvalds@osdl.org>,
  22 Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.
  23
  24 Documentation
  25 --------------
  26 Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
  27
  28 GIT
  29 ---
  30 Part of the link:git.html[git] suite
  31