Skip site navigation (1)Skip section navigation (2)

FreeBSD Manual Pages

  
 
  

home | help
GIT-MERGE-ONE-FIL(1)		  Git Manual		  GIT-MERGE-ONE-FIL(1)

NAME
       git-merge-one-file - The	standard helper	program	to use with
       git-merge-index

SYNOPSIS
       git merge-one-file

DESCRIPTION
       This is the standard helper program to use with git merge-index to
       resolve a merge after the trivial merge done with git read-tree -m.

GIT
       Part of the git(1) suite

Git 2.13.2			  06/24/2017		  GIT-MERGE-ONE-FIL(1)

NAME | SYNOPSIS | DESCRIPTION | GIT

Want to link to this manual page? Use this URL:
<https://www.freebsd.org/cgi/man.cgi?query=git-merge-one-file&sektion=1&manpath=FreeBSD+12.0-RELEASE+and+Ports>

home | help