table of contents
other versions
- bullseye 1:2.30.2-1
- bullseye-backports 1:2.39.2-1~bpo11+1
- testing 1:2.39.2-1.1
- unstable 1:2.40.0-1
- experimental 1:2.39.2+next.20230215-1
| 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
| 03/10/2021 | Git 2.30.2 |