table of contents
other versions
- buster 1:2.20.1-2+deb10u3
- buster-backports 1:2.29.2-1~bpo10+1
- testing 1:2.30.2-1
- unstable 1:2.32.0-1
- experimental 1:2.32.0+next.20210606-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-indexSYNOPSIS¶
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| 12/03/2020 | Git 2.29.2 |