From cbcc4775db9a1b8bd1cb0cb0a9181227b50af279 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Tue, 24 Aug 2010 20:39:35 +0200 Subject: [PATCH] Order .gitignore alphabetically MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This should reduce merge conflicts for commits that add entries (at least after this commit is handled :-) Signed-off-by: Uwe Kleine-König --- .gitignore | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 2f6d991..6591d03 100644 --- a/.gitignore +++ b/.gitignore @@ -1,33 +1,35 @@ +# vim swap files +.*.swp + +# quilt working directory +/.pc + +# .deb build stamp +/build-stamp + /hooks/pre-commit +/tg /tg-create /tg-create.txt /tg-delete /tg-delete.txt /tg-depend /tg-depend.txt +/tg-export +/tg-export.txt +/tg-import +/tg-import.txt /tg-info /tg-info.txt /tg-mail /tg-mail.txt /tg-patch /tg-patch.txt +/tg-push +/tg-push.txt +/tg-remote +/tg-remote.txt /tg-summary /tg-summary.txt /tg-update /tg-update.txt -/tg-export -/tg-export.txt -/tg-import -/tg-import.txt -/tg-remote -/tg-remote.txt -/tg-push -/tg-push.txt -/tg -.*.swp - -# quilt working directory -/.pc - -# .deb build stamp -/build-stamp -- 2.11.4.GIT