Commit d3fffaa7 authored by Simon McVittie's avatar Simon McVittie

.gitignore: Normalize into 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's avatarSimon McVittie <smcv@collabora.com>
parent 0c62a9a5
...@@ -3,16 +3,16 @@ ...@@ -3,16 +3,16 @@
/dbus-daemon-activation-helper-test /dbus-daemon-activation-helper-test
/dbus-daemon-launch-helper /dbus-daemon-launch-helper
/dbus-daemon-launch-helper-test /dbus-daemon-launch-helper-test
/test-bus /dbus.service
/rc.messagebus /dbus.socket
/example-session-disable-stats.conf
/example-system-enable-stats.conf
/messagebus /messagebus
/messagebus-config /messagebus-config
/org.freedesktop.dbus-session.plist
/rc.messagebus
/session.conf /session.conf
/system.conf /system.conf
/test-bus
/test-bus-launch-helper /test-bus-launch-helper
/test-bus-system /test-bus-system
/dbus.service
/dbus.socket
/org.freedesktop.dbus-session.plist
/example-session-disable-stats.conf
/example-system-enable-stats.conf
/test-dbus
/dbus-arch-deps.h
/.dbus-keyrings /.dbus-keyrings
/dbus-arch-deps.h
/test-dbus
/versioninfo.rc /versioninfo.rc
*.1 *.1
*.1.xml
*.1.html *.1.html
*.1.xml
/C.css
/api/ /api/
/dbus.devhelp2 /dbus-api-design.html
/dbus-api-design.page
/dbus-docs.tar.xz
/dbus-docs/
/dbus-faq.html
/dbus-specification.html /dbus-specification.html
/dbus-test-plan.html /dbus-test-plan.html
/dbus-tutorial.html /dbus-tutorial.html
/dbus-faq.html /dbus.devhelp2
/dbus-docs/
/dbus-docs.tar.xz
/doxygen.stamp /doxygen.stamp
/dbus-api-design.page
/dbus-api-design.html
/highlight.pack.js /highlight.pack.js
/jquery.js /jquery.js
/jquery.syntax.brush.html.js /jquery.syntax.brush.html.js
...@@ -19,4 +20,3 @@ ...@@ -19,4 +20,3 @@
/jquery.syntax.js /jquery.syntax.js
/jquery.syntax.layout.yelp.js /jquery.syntax.layout.yelp.js
/yelp.js /yelp.js
/C.css
/manual-authz
/manual-dir-iter
/manual-tcp
/test-bus /test-bus
/test-spawn
/test-corrupt /test-corrupt
/test-dbus-daemon
/test-dbus-daemon-eavesdrop
/test-exit /test-exit
/test-segfault
/test-service
/test-sleep-forever
/test-shell
/test-shell-service
/test-names
/test-loopback /test-loopback
/test-relay
/test-dbus-daemon
/test-marshal /test-marshal
/manual-authz /test-names
/manual-dir-iter
/manual-tcp
/test-dbus-daemon-eavesdrop
/test-printf /test-printf
/test-privserver /test-privserver
/test-refs /test-refs
/test-relay
/test-segfault
/test-service
/test-shell
/test-shell-service
/test-sleep-forever
/test-spawn
/test-syntax /test-syntax
/test-syslog /test-syslog
/as-another-user.conf /as-another-user.conf
/count-fds.conf /count-fds.conf
/debug-allow-all.conf
/debug-allow-all-sha1.conf /debug-allow-all-sha1.conf
/debug-allow-all.conf
/finite-timeout.conf
/forbidding.conf /forbidding.conf
/incoming-limit.conf /incoming-limit.conf
/limit-containers.conf /limit-containers.conf
...@@ -13,8 +14,7 @@ ...@@ -13,8 +14,7 @@
/max-replies-per-connection.conf /max-replies-per-connection.conf
/multi-user.conf /multi-user.conf
/pending-fd-timeout.conf /pending-fd-timeout.conf
/run-with-tmp-session-bus.conf
/session.conf /session.conf
/systemd-activation.conf /systemd-activation.conf
/tmp-session.conf /tmp-session.conf
/run-with-tmp-session-bus.conf
/finite-timeout.conf
/tmp-session-bus.*.conf /test-autolaunch
/test-ids /test-ids
/test-names /test-names
/test-pending-call-dispatch /test-pending-call-dispatch
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
/test-privserver-client /test-privserver-client
/test-shutdown /test-shutdown
/test-threads-init /test-threads-init
/test-autolaunch /tmp-session-bus.*.conf
/dbus-send
/dbus-monitor
/dbus-cleanup-sockets /dbus-cleanup-sockets
/dbus-launch /dbus-launch
/dbus-uuidgen /dbus-monitor
/dbus-run-session /dbus-run-session
/run-with-tmp-session-bus.conf /dbus-send
/dbus-test-tool /dbus-test-tool
/dbus-uuidgen
/run-with-tmp-session-bus.conf
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment