From: Simon McVittie <smcv@collabora.com>
Date: Fri, 14 Dec 2018 12:42:52 +0000 (+0000)
Subject: Top level .gitignore: Sort anchored patterns in LC_ALL=C sort order
X-Git-Tag: dbus-1.13.10~37^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d79986db284904f631407c539baa2e1ab7b8c5a7;p=thirdparty%2Fdbus.git

Top level .gitignore: Sort anchored patterns in LC_ALL=C sort order

If lists are in a completely arbitrary order, sorting them consistently
means that there is only one correct place to insert a new entry, avoiding
the merge conflicts that would occur if we always append new entries.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---

diff --git a/.gitignore b/.gitignore
index 7c68ce91a..82d27563f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,27 @@
-/.ccache/
-/build-aux/
-/config.cache
-/config.log
-/config.status
-/configure
 /*.pc
-/libtool
-/m4/lt*.m4
-/m4/libtool.m4
-/stamp-h1
-/stamp-h
-/stamp-h.in
+/.ccache/
 /Doxyfile
 /aclocal.m4
 /autom4te.cache
+/build-aux/
+/bus/tmpfiles.d/dbus.conf
+/config.cache
 /config.h
 /config.h.in
-/bus/tmpfiles.d/dbus.conf
-/dbus-1.*/
+/config.log
+/config.status
+/configure
 /dbus-1.*.tar.*
+/dbus-1.*/
 /lcov.html/
 /lcov.info
 /lcov.info.tmp
+/libtool
+/m4/libtool.m4
+/m4/lt*.m4
+/stamp-h
+/stamp-h.in
+/stamp-h1
 /test-driver
 
 *.bb