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
Software: Apache/2.4.41 (Ubuntu). PHP/8.0.30 uname -a: Linux apirnd 5.4.0-204-generic #224-Ubuntu SMP Thu Dec 5 13:38:28 UTC 2024 x86_64 uid=33(www-data) gid=33(www-data) groups=33(www-data) Safe-mode: OFF (not secure) /usr/share/doc/git-doc/ drwxr-xr-x | |
| Viewing file: Select action/file-type: git-merge-one-file(1) Manual PageNAMEgit-merge-one-file - The standard helper program to use with git-merge-index SYNOPSISgit merge-one-file DESCRIPTIONThis 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. GITPart of the git(1) suite |
:: Command execute :: | |
--[ c99shell v. 2.5 [PHP 8 Update] [24.05.2025] | Generation time: 0.0328 ]-- |