Andrew's git / gitweb.git / Documentation/git-merge-one-file.txt
?
Documentation / git-merge-one-file.txton commit grep: add color.grep.matchcontext and color.grep.matchselected (79a7710)
   1git-merge-one-file(1)
   2=====================
   3
   4NAME
   5----
   6git-merge-one-file - The standard helper program to use with git-merge-index
   7
   8
   9SYNOPSIS
  10--------
  11[verse]
  12'git merge-one-file'
  13
  14DESCRIPTION
  15-----------
  16This is the standard helper program to use with 'git merge-index'
  17to resolve a merge after the trivial merge done with 'git read-tree -m'.
  18
  19GIT
  20---
  21Part of the linkgit:git[1] suite