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

package info (click to toggle)
git 1%3A2.20.1-2%2Bdeb10u3
  • links: PTS, VCS
  • area: main
  • in suites: buster
  • size: 45,676 kB
  • sloc: ansic: 210,769; sh: 180,432; perl: 29,102; tcl: 21,663; python: 6,143; makefile: 3,700; sed: 189; php: 120; asm: 98; csh: 45; ruby: 24; 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