File: git-merge-one-file.txt

package info (click to toggle)
git 1%3A2.47.3-0%2Bdeb13u1
  • links: PTS, VCS
  • area: main
  • in suites: trixie
  • size: 59,700 kB
  • sloc: ansic: 298,483; sh: 255,583; perl: 29,458; tcl: 22,173; makefile: 4,235; python: 3,442; javascript: 772; awk: 47; csh: 45; ruby: 43; lisp: 12
file content (21 lines) | stat: -rw-r--r-- 387 bytes parent folder | download | duplicates (23) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
 
git-merge-one-file(1)
=====================

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


SYNOPSIS
--------
[verse]
'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 linkgit:git[1] suite