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

package info (click to toggle)
git 1%3A2.11.0-3~bpo8%2B1
  • links: PTS, VCS
  • area: main
  • in suites: jessie-backports
  • size: 34,688 kB
  • sloc: ansic: 175,513; sh: 154,292; perl: 29,745; tcl: 21,549; python: 6,781; makefile: 3,404; lisp: 1,786; php: 120; asm: 98; csh: 45
file content (9 lines) | stat: -rw-r--r-- 293 bytes parent folder | download | duplicates (13) 
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