From 8a76e5fff253ad6db9f2139e4b073a5dcc5d6da7 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin <mthl@gnu.org>
Date: Thu, 21 Jan 2016 20:32:06 +0100
Subject: [PATCH] Update .gitignore.

* .gitignore: Sort lines.  Use globbing for "*.{eps,pdf,png,tar.xz}"
files.
---
 .gitignore | 158 ++++++++++++++++++++++++-----------------------------
 1 file changed, 72 insertions(+), 86 deletions(-)

diff --git a/.gitignore b/.gitignore
index 098c9bb65c..b5bbbaabdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,16 @@
+*.eps
+*.go
+*.log
+*.pdf
+*.png
+*.tar.xz
+*.tmp
 *~
 ,*
-*.tmp
-*.go
-tmp
-*.log
+/ABOUT-NLS
+/INSTALL
+/aclocal.m4
+/autom4te.cache
 /build-aux/compile
 /build-aux/config.guess
 /build-aux/config.rpath
@@ -14,14 +21,41 @@ tmp
 /build-aux/missing
 /build-aux/test-driver
 /build-aux/texinfo.tex
-/configure
-Makefile.in
-Makefile
-/autom4te.cache
-config.cache
-/aclocal.m4
 /config.status
-/ABOUT-NLS
+/configure
+/doc/*.1
+/doc/.dirstamp
+/doc/guix.aux
+/doc/guix.cp
+/doc/guix.cps
+/doc/guix.fn
+/doc/guix.fns
+/doc/guix.info
+/doc/guix.info-[0-9]
+/doc/guix.ky
+/doc/guix.pg
+/doc/guix.toc
+/doc/guix.tp
+/doc/guix.vr
+/doc/guix.vrs
+/doc/os-config-bare-bones.texi
+/doc/os-config-desktop.texi
+/doc/stamp-vti
+/doc/version.texi
+/emacs/Makefile
+/emacs/Makefile.in
+/emacs/guix-autoloads.el
+/emacs/guix-config.el
+/emacs/guix-helper.scm
+/etc/guix-daemon.conf
+/etc/guix-daemon.service
+/guix-daemon
+/guix-register
+/guix/config.scm
+/libformat.a
+/libstore.a
+/libutil.a
+/m4/*
 /m4/ChangeLog
 /m4/gettext.m4
 /m4/iconv.m4
@@ -31,6 +65,20 @@ config.cache
 /m4/nls.m4
 /m4/po.m4
 /m4/progtest.m4
+/nix-setuid-helper
+/nix/AUTHORS
+/nix/COPYING
+/nix/config.h
+/nix/config.h.in
+/nix/nix-daemon/nix-daemon.cc
+/nix/nix-setuid-helper/nix-setuid-helper.cc
+/nix/scripts/guix-authenticate
+/nix/scripts/list-runtime-roots
+/nix/scripts/offload
+/nix/scripts/substitute
+/po/guix/*.gmo
+/po/guix/*.insert-header
+/po/guix/*.mo
 /po/guix/ChangeLog
 /po/guix/Makefile.in.in
 /po/guix/Makevars.template
@@ -39,15 +87,15 @@ config.cache
 /po/guix/boldquot.sed
 /po/guix/en@boldquot.*
 /po/guix/en@quot.*
+/po/guix/guix.pot
 /po/guix/insert-header.sin
-/po/guix/*.insert-header
 /po/guix/quot.sed
 /po/guix/remove-potcdate.sed
 /po/guix/remove-potcdate.sin
 /po/guix/stamp-po
-/po/guix/guix.pot
-/po/guix/*.mo
-/po/guix/*.gmo
+/po/packages/*.gmo
+/po/packages/*.insert-header
+/po/packages/*.mo
 /po/packages/ChangeLog
 /po/packages/Makefile.in.in
 /po/packages/Makevars.template
@@ -56,84 +104,22 @@ config.cache
 /po/packages/boldquot.sed
 /po/packages/en@boldquot.*
 /po/packages/en@quot.*
+/po/packages/guix-packages.pot
 /po/packages/insert-header.sin
-/po/packages/*.insert-header
 /po/packages/quot.sed
 /po/packages/remove-potcdate.sed
 /po/packages/remove-potcdate.sin
 /po/packages/stamp-po
-/po/packages/guix-packages.pot
-/po/packages/*.mo
-/po/packages/*.gmo
-/tests/*.trs
-/INSTALL
-/m4/*
 /pre-inst-env
-/doc/.dirstamp
-/doc/guix.info
-/doc/guix.info-[0-9]
-/doc/guix.pdf
-/doc/stamp-vti
-/doc/version.texi
-/gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz
-/gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz
-/gnu/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz
-/gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz
-/guix/config.scm
-/nix/nix-daemon/nix-daemon.cc
-/nix/config.h
-/nix/config.h.in
-stamp-h[0-9]
-/nix/AUTHORS
-/nix/COPYING
-/libformat.a
-/libstore.a
-/libutil.a
-/guix-daemon
-/test-tmp
-/nix/scripts/list-runtime-roots
-/test-env
-/nix/nix-setuid-helper/nix-setuid-helper.cc
 /scripts/guix
-/doc/guix.aux
-/doc/guix.cp
-/doc/guix.cps
-/doc/guix.fn
-/doc/guix.fns
-/doc/guix.ky
-/doc/guix.pg
-/doc/guix.toc
-/doc/guix.tp
-/doc/guix.vr
-/doc/guix.vrs
-/nix/scripts/substitute
-/doc/images/bootstrap-graph.png
-/doc/images/bootstrap-graph.eps
-/guix-register
+/test-env
+/test-tmp
+/tests/*.trs
 GPATH
 GRTAGS
 GTAGS
-/nix-setuid-helper
-/nix/scripts/guix-authenticate
-/nix/scripts/offload
-/emacs/Makefile.in
-/emacs/Makefile
-/emacs/guix-autoloads.el
-/emacs/guix-helper.scm
-/emacs/guix-config.el
-/doc/os-config-bare-bones.texi
-/doc/os-config-desktop.texi
-/doc/*.1
-/etc/guix-daemon.service
-/etc/guix-daemon.conf
-/doc/images/bootstrap-graph.pdf
-/doc/images/coreutils-bag-graph.png
-/doc/images/coreutils-graph.png
-/doc/images/coreutils-size-map.eps
-/doc/images/service-graph.png
-/doc/images/service-graph.eps
-/doc/images/service-graph.pdf
-/doc/images/dmd-graph.png
-/doc/images/bootstrap-packages.png
-/doc/images/bootstrap-packages.eps
-/doc/images/bootstrap-packages.pdf
+Makefile
+Makefile.in
+config.cache
+stamp-h[0-9]
+tmp