Sort .gitignore (using sort -d -- dictionary order).

.gitignore

@@ -1,9 +1,5 @@
 *~
 *.a
-test1.img
-test2.img
-test.err
-test.out
 ABOUT-NLS
 aclocal.m4
 align/stamp-virt-alignment-scan.pod
@@ -17,6 +13,7 @@ appliance/supermin.d
 autom4te.cache
 *.bak
 bindtests.tmp
+/build-aux
 cat/stamp-virt-*.pod
 cat/virt-cat
 cat/virt-cat.1
@@ -45,9 +42,9 @@ configure
 cscope.out
 csharp/Libguestfs.cs
 daemon/actions.h
+daemon/errnostring.c
 daemon/errnostring_gperf.c
 daemon/errnostring_gperf.gperf
-daemon/errnostring.c
 daemon/errnostring.h
 daemon/guestfsd
 daemon/guestfsd.exe
@@ -64,9 +61,11 @@ depcomp
 df/stamp-virt-df.pod
 df/virt-df
 df/virt-df.1
+*.diff
 edit/stamp-virt-*.pod
 edit/virt-edit
 edit/virt-edit.1
+*.eml
 emptydisk
 erlang/erl-guestfs
 erlang/erl-guestfs.c
@@ -109,10 +108,16 @@ fish/virt-tar-out.1
 fuse/guestmount
 fuse/guestmount.1
 fuse/stamp-guestmount.pod
-generator/.pod2text.data*
 generator/files-generated.txt
 generator/generator
+generator/.pod2text.data*
 generator/stamp-generator
+.gitattributes
+.git-module-status
+/gnulib
+/GNUmakefile
+.guestfs-*
+guestfs.*
 guestfsd-in-wine.log
 haskell/Bindtests
 haskell/Bindtests.hs
@@ -193,11 +198,11 @@ m4/lt~obsolete.m4
 m4/ltoptions.m4
 m4/ltsugar.m4
 m4/ltversion.m4
+/maint.mk
 Makefile
 Makefile.in
 missing
 *.o
-ocamlinit-stamp
 ocaml/bindtests
 ocaml/bindtests.ml
 ocaml/dllmlguestfs.so
@@ -210,6 +215,7 @@ ocaml/guestfs_inspector.ml
 ocaml/guestfs_inspector.mli
 ocaml/guestfs.ml
 ocaml/guestfs.mli
+ocamlinit-stamp
 ocaml/META
 ocaml/t/guestfs_005_load
 ocaml/t/guestfs_010_basic
@@ -217,22 +223,21 @@ ocaml/t/guestfs_070_threads
 ocaml/t/guestfs_080_optargs
 ocaml/t/guestfs_400_events
 ocaml/t/guestfs_400_progress
+*.orig
+*.patch
 perl/bindtests.pl
 perl/blib
+perl/examples/guestfs-perl.3
+perl/examples/stamp-guestfs-perl.pod
 perl/Guestfs.bs
 perl/Guestfs.c
 perl/Guestfs.xs
-perl/examples/guestfs-perl.3
-perl/examples/stamp-guestfs-perl.pod
 perl/lib/Sys/Guestfs.pm
 perl/Makefile-pl
-perl/Makefile-pl.old
 perl/Makefile.PL
+perl/Makefile-pl.old
 perl/MYMETA.yml
 perl/pm_to_blib
-php/extension/Makefile.fragments
-php/extension/Makefile.global
-php/extension/Makefile.objects
 php/extension/acinclude.m4
 php/extension/build/
 php/extension/config.nice
@@ -244,39 +249,43 @@ php/extension/guestfs_php_*.log
 php/extension/guestfs_php_*.out
 php/extension/guestfs_php_*.php
 php/extension/guestfs_php_*.sh
+php/extension/Makefile.fragments
+php/extension/Makefile.global
+php/extension/Makefile.objects
 php/extension/mkinstalldirs
 php/extension/modules/
 php/extension/php_guestfs_php.h
 php/extension/run-tests.php
 php/extension/tmp-php.ini
-pod2htm?.tmp
-po/*.gmo
-po/Makevars.template
-po/POTFILES
-po/remove-potcdate.sed
-po/stamp-it
-po/stamp-po
-po/LINGUAS
-po/Rules-quot
 po/boldquot.sed
-po/en@boldquot.header
-po/en@quot.header
-po/insert-header.sin
-po/quot.sed
-po/remove-potcdate.sin
-po-docs/po4a.conf
-po-docs/*/*.pl
-po-docs/*/*.pod
+pod2htm?.tmp
 po-docs/*/*.1
 po-docs/*/*.3
+po-docs/*/*.pl
+po-docs/po4a.conf
+po-docs/*/*.pod
 podwrapper.sh
-python/__pycache__
+po/en@boldquot.header
+po/en@quot.header
+po/*.gmo
+po/insert-header.sin
+po/LINGUAS
+po/Makevars.template
+po/POTFILES
+po/quot.sed
+po/remove-potcdate.sed
+po/remove-potcdate.sin
+po/Rules-quot
+po/stamp-it
+po/stamp-po
 python/bindtests.py
 python/examples/guestfs-python.3
 python/examples/stamp-guestfs-python.pod
 python/guestfs.py
 python/guestfs-py.c
 python/guestfs.pyc
+python/__pycache__
+*.rej
 rescue/stamp-virt-rescue.pod
 rescue/virt-rescue
 rescue/virt-rescue.1
@@ -300,42 +309,43 @@ sparsify/virt-sparsify
 sparsify/virt-sparsify.1
 src/actions.c
 src/bindtests.c
+src/errnostring.c
 src/errnostring_gperf.c
 src/errnostring_gperf.gperf
-src/errnostring.c
 src/errnostring.h
+src/guestfs.3
+src/guestfs-actions.pod
+src/guestfs-availability.pod
 src/guestfs.h
 src/guestfs-internal-actions.h
 src/guestfs_protocol.c
 src/guestfs_protocol.h
 src/guestfs_protocol.x
-src/guestfs.3
-src/guestfs-actions.pod
-src/guestfs-availability.pod
 src/guestfs-structs.pod
-src/.libs/libguestfs.so
 src/libguestfs.syms
+src/.libs/libguestfs.so
 src/stamp-guestfs.pod
-*.swp
 stamp-h1
-test-tool/libguestfs-test-tool
-test-tool/libguestfs-test-tool.1
-test-tool/libguestfs-test-tool-helper
-tests/c-api/test.log
+*.swp
+test1.img
+test2.img
+test.err
+test.out
 tests/c-api/test-add-drive-opts
 tests/c-api/test-add-libvirt-dom
 tests/c-api/test-command
 tests/c-api/test-config
 tests/c-api/test-create-handle
 tests/c-api/test-debug-to-file
+tests/c-api/test*.img
 tests/c-api/test-just-header
 tests/c-api/test-last-errno
+tests/c-api/test.log
 tests/c-api/test-private-data
-tests/c-api/test-user-cancel
-tests/c-api/test*.img
 tests/c-api/tests
 tests/c-api/tests.c
 tests/c-api/test*.tmp
+tests/c-api/test-user-cancel
 tests/data/100kallnewlines
 tests/data/100kallspaces
 tests/data/100kallzeroes
@@ -346,8 +356,8 @@ tests/data/hello.b64
 tests/data/initrd
 tests/data/initrd-x86_64.img
 tests/data/initrd-x86_64.img.gz
-tests/data/test.iso
 tests/data/test-grep.txt.gz
+tests/data/test.iso
 tests/extra/valgrind.log
 tests/guests/debian.img
 tests/guests/fedora.img
@@ -358,20 +368,9 @@ tests/guests/guest-aux/fedora-packages.db
 tests/guests/ubuntu.img
 tests/guests/windows.img
 tests/regressions/rhbz501893
+test-tool/libguestfs-test-tool
+test-tool/libguestfs-test-tool.1
+test-tool/libguestfs-test-tool-helper
 tools/test.img
 tools/virt-*.1
 tools/virt-*.pl
-/GNUmakefile
-/maint.mk
-/build-aux
-/gnulib
-.git-module-status
-.guestfs-*
-guestfs.*
-
-*.eml
-*.patch
-*.rej
-*.orig
-*.diff
-.gitattributes