summaryrefslogtreecommitdiff
path: root/init.d/50git-ignore
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-01-04 17:17:39 +0100
committerJoey Hess <joey@kodama.kitenet.net>2008-01-04 11:53:08 -0500
commit3ae36d1c7fc9787e335c29075cbae5326575b2c3 (patch)
treec40a11c3435a16d365078191be5375e15b44bd7e /init.d/50git-ignore
parentb373664446fb85be14e0d264bff25fb8c9a76108 (diff)
Merge branch 'pacman-g2'
Conflicts: Makefile pre-install.d/50uncommitted-changes Additinoal fix: As noted by Joey, we should bail out with an error if git commit fails when using pacman-g2. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Diffstat (limited to 'init.d/50git-ignore')
-rwxr-xr-xinit.d/50git-ignore8
1 files changed, 8 insertions, 0 deletions
diff --git a/init.d/50git-ignore b/init.d/50git-ignore
index de58ed5..778774e 100755
--- a/init.d/50git-ignore
+++ b/init.d/50git-ignore
@@ -7,6 +7,14 @@ if [ ! -e .gitignore ]; then
*.dpkg-*
EOF
fi
+ if [ "$LOWLEVEL_PACKAGE_MANAGER" = "pacman-g2" ]; then
+ cat >.gitignore <<EOF
+# new and old versions of conffiles, stored by pacman
+*.pacnew
+*.pacorig
+*.pacsave
+EOF
+ fi
cat >>.gitignore <<EOF
*~