From bd8893a76cc82f31fabd2dc4c508506bcb020675 Mon Sep 17 00:00:00 2001
From: Darshit Shah <darnir@gmail.com>
Date: Sun, 16 Nov 2014 12:30:57 +0530
Subject: [PATCH] Fix mangled gitignore file

---
 .gitignore | 45 ++++++++++++++++++++++-----------------------
 ChangeLog  |  4 ++++
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index 86e37799..b4e2b946 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,7 @@
 # Project Root
-# Wildcard Ignores
-# build-aux/
-# doc/
-# m4/
-# others
-# po/
-# src/
-# testenv/
-# tests/
-# util/
-*~
 /.sc-start-sc_bindtextdomain
 /.sc-start-sc_prohibit_HAVE_MBRTOWC
 /.version
-/ABOUT-NLS~
 /GNUmakefile
 /INSTALL
 /Makefile
@@ -24,10 +12,18 @@
 /config.log
 /config.status
 /configure
-/cscope.out
 /lib/
 /maint.mk
-/tags
+# Wildcard Ignores
+*~
+po/*.gmo*
+po/*.po*
+src/*.o
+tests/*.log
+tests/*.trs
+testenv/*.log
+testenv/*.trs
+# build-aux/
 build-aux/.gitignore
 build-aux/compile
 build-aux/config.guess
@@ -39,6 +35,7 @@ build-aux/missing
 build-aux/snippet/
 build-aux/test-driver
 build-aux/texinfo.tex
+# doc/
 doc/Makefile
 doc/Makefile.in
 doc/sample.wgetrc.munged_for_texi_inclusion
@@ -47,10 +44,10 @@ doc/version.texi
 doc/wget.1
 doc/wget.info
 doc/wget.pod
+# m4/
 m4/.gitignore
 m4/gnulib-cache.m4
-po/*.gmo*
-po/*.po*
+# po/
 po/.gitignore
 po/.reference/
 po/LINGUAS
@@ -59,7 +56,7 @@ po/Makefile.in
 po/Makevars
 po/POTFILES
 po/wget.pot
-src/*.o
+# src/
 src/.deps/
 src/Makefile
 src/Makefile.in
@@ -74,20 +71,22 @@ src/stamp-h1
 src/tags
 src/version.c
 src/wget
-testenv/*.log
-testenv/*.trs
-testenv/Makefile
-testenv/Makefile.in
+# testenv/
 testenv/conf/__pycache__/
 testenv/exc/__pycache__/
 testenv/misc/__pycache__/
 testenv/server/__pycache__/
 testenv/server/http/__pycache__/
 testenv/test/__pycache__/
-tests/*.log
-tests/*.trs
+testenv/Makefile
+testenv/Makefile.in
+# tests/
 tests/Makefile
 tests/Makefile.in
 tests/unit-tests
+# util/
 util/Makefile
 util/Makefile.in
+# others
+/tags
+/cscope.out
diff --git a/ChangeLog b/ChangeLog
index c5f2106f..35a3c557 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-16  Darshit Shah  <darnir@gmail.com>
+
+	* .gitignore: Sort gitignore file based on directories
+
 2014-11-15  Darshit Shah  <darnir@gmail.com>
 	* configure.ac: Add AC_HEADER_ASSERT. Enables --disable-assert option