From: Steve Youngs <steve@sxemacs.org>
Date: Tue, 14 Jun 2016 13:11:24 +0000 (+1000)
Subject: Preserve our copies of gnus/.gitignore and riece/.gitignore
X-Git-Tag: auctex_2.00~15
X-Git-Url: http://cgit.sxemacs.org/?p=packages;a=commitdiff_plain;h=81ea089e483226bb6ea77b0af588d654b79d68ed

Preserve our copies of gnus/.gitignore and riece/.gitignore

Both the Gnus and Riece packages contain .gitignore files that don't play
nice within our packages repo.  So, through the magic of .gitattributes
and custom merge drivers we can ensure that our copies of those files are
never overwritten whenever we update those packages.

For a discussion on how it works, see: http://bit.ly/1UhBeqS

One final thing that you, oh mighty SXEmacs packages dev, must do is to
set up the custom merge driver.  And nothing could be simpler...

  git config merge.sxepkg.driver true

...is all you need.  BTW, that's not a bool, the 'true' there refers to
the command (often a shell built-in or /bin/true)

	* .gitattributes: New.
	Use the sxepkg merge driver on gnus/.gitignore
	Use the sxepkg merge driver on riece/.gitignore

Signed-off-by: Steve Youngs <steve@sxemacs.org>
---

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..48f08d04
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+xemacs-packages/gnus/.gitignore merge=sxepkg
+xemacs-packages/riece/.gitignore merge=sxepkg