File: git-doc.doc-base.git-trivial-merge-rules

package info (click to toggle)
git 1%3A2.30.2-1%2Bdeb11u2
  • links: PTS, VCS
  • area: main
  • in suites: bullseye
  • size: 53,128 kB
  • sloc: ansic: 237,972; sh: 206,995; perl: 29,970; tcl: 22,151; python: 6,357; makefile: 3,843; javascript: 772; sed: 189; asm: 98; csh: 45; ruby: 43; lisp: 12
file content (9 lines) | stat: -rw-r--r-- 293 bytes parent folder | download | duplicates (12) 
1
2
3
4
5
6
7
8
9
 
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