]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 65b7543)
githubmap: define merge conflict resolution 18223/head
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 10 Oct 2017 19:05:41 +0000 (12:05 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 10 Oct 2017 19:06:34 +0000 (12:06 -0700)
Use "union" merge to automatically resolve trivial append merge conflicts from
using ptl-tool.py.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
.gitattributes [new file with mode: 0644] patch | blob

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..93a74fe
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+.githubmap merge=union
Unnamed repository; edit this file 'description' to name the repository.