From 465ba00605c3e731ae94a3cf2d13baf7ee39620c Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 3 Nov 2010 10:03:07 +0100
Subject: [PATCH] when merging a branch, make sure all filters are applied

---
 all | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/all b/all
index 35f09f9d..f2f9dcdd 100755
--- a/all
+++ b/all
@@ -1129,6 +1129,11 @@ case "$cmd" in
 								reportecho4 "--> test failed, postponed"
 							fi
 						else
+							# apply crlf, or other cleanup filters (non-behavioural changes)
+							git reset --hard
+							find . -type f -exec touch {} \;
+							git commit -a --amend -c HEAD
+
 							echo "MERGING"
 							case ",`repoflags "$d"`," in
 								*,svn,*)
-- 
2.39.2