table of contents
other versions
- wheezy 1:1.7.10.4-1+wheezy3
- wheezy-backports 1:1.9.1-1~bpo70+2
- jessie 1:2.1.4-2.1+deb8u2
- jessie-backports 1:2.11.0-3~bpo8+1
- testing 1:2.11.0-3
- unstable 1:2.11.0-4
- experimental 1:2.13.1+next.20170610-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) suite03/19/2016 | Git 1.7.10.4 |