← Back to branch summary

~kendfinger-deactivatedaccount/git/debian

« back to all changes in this revision

Viewing changes to debian/git-doc.doc-base.git-trivial-merge-rules

  • Committer: Kenneth Endfinger
  • Date: 2012-05-12 14:43:59 UTC
  • Revision ID: chromeosforchromebook@gmail.com-20120512144359-oqa02j781iqfcuwu
Initial Commit of Git debian branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/git-doc.doc-base.git-trivial-merge-rules
 
1
Document: git-trivial-merge-rules
 
2
Title: Trivial merge rules for git read-tree
 
3
Author: Daniel Barkalow
 
4
Abstract: This document describes the outcomes of the
 
5
 trivial merge logic in git read-tree.
 
6
Section: File Management
 
7
 
 
8
Format: Text
 
9
Files: /usr/share/doc/git-doc/technical/trivial-merge.txt