diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:47:55 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:47:55 +0000 |
| commit | f04f772d4c2791a1bc0e36fe8df2dc8d62ea8378 (patch) | |
| tree | 6601becfb9eccb5e3361f1f802e96ea7839bfca8 /debian/git-doc.doc-base.git-trivial-merge-rules | |
| parent | Adding upstream version 1:2.39.2. (diff) | |
| download | git-f04f772d4c2791a1bc0e36fe8df2dc8d62ea8378.tar.xz git-f04f772d4c2791a1bc0e36fe8df2dc8d62ea8378.zip | |
Adding debian version 1:2.39.2-1.1.debian/1%2.39.2-1.1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | debian/git-doc.doc-base.git-trivial-merge-rules | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/debian/git-doc.doc-base.git-trivial-merge-rules b/debian/git-doc.doc-base.git-trivial-merge-rules new file mode 100644 index 0000000..b6ae363 --- /dev/null +++ b/debian/git-doc.doc-base.git-trivial-merge-rules @@ -0,0 +1,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 |