table of contents
other versions
- jessie 1:2.1.4-2.1+deb8u6
- jessie-backports 1:2.11.0-3~bpo8+1
- stretch 1:2.11.0-3+deb9u4
- testing 1:2.20.1-2
- stretch-backports 1:2.20.1-1~bpo9+1
- unstable 1:2.20.1-2
- experimental 1:2.21.0+next.20190320-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) suite05/28/2018 | Git 2.1.4 |