From f122ffa76fffb5b89931d30b89b1a77d753b22b1 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 22 Mar 2014 12:54:51 +0100
Subject: [PATCH] Makefile: ignore etc/conf in the git repository after running
 make.

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index b8bd5178f0..5e2278af8e 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,8 @@ all:
 		${CURDIR}/common/xbps-src/xbps-src.sh > ${CURDIR}/xbps-src
 	$(CC) $(CFLAGS) ${LIBEXECDIR}/$(CHROOT_C) -o ${LIBEXECDIR}/$(CHROOT_BIN)
 	chmod 755 xbps-src
+	@echo "Ignoring changes to etc/conf for local overrides."
+	@git update-index --assume-unchanged etc/conf
 	@echo
 	@echo "The chroot helper must be a setgid binary (4750) for the group '$(PRIVILEGED_GROUP)'."
 	@echo "Please run 'sudo make setup' to set appropiate permissions."